From 288ed5907950a0231f214ef33d6a4b0b262f88d5 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Thu, 2 Jul 2015 07:23:33 +0000 Subject: Revert tree to r17801 Revert r17802 "BaseTools: AArch64: use explicit linker scripts" Revert r17803 "ArmVirtPkg: build runtime drivers with 64 KB section alignment" Revert r17804 "IntelFrameworkModulePkg: AcpiS3SaveDxe: prepare for End-of-Dxe callback" Revert r17805 "IntelFrameworkModulePkg: AcpiS3SaveDxe: call S3Ready() at End-of-Dxe" Revert r17806 "OvmfPkg: AcpiS3SaveDxe: prepare for End-of-Dxe callback" Requested-by: Ard Biesheuvel Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17807 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'OvmfPkg') diff --git a/OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c b/OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c index f05764af8b..f322981b53 100644 --- a/OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c +++ b/OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c @@ -2,7 +2,6 @@ This is an implementation of the ACPI S3 Save protocol. This is defined in S3 boot path specification 0.9. -Copyright (c) 2014-2015, Red Hat, Inc.
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials @@ -403,8 +402,6 @@ LegacyGetS3MemorySize ( OUT UINTN *Size ) { - ASSERT (FALSE); - if (Size == NULL) { return EFI_INVALID_PARAMETER; } @@ -494,8 +491,6 @@ S3Ready ( } AlreadyEntered = TRUE; - ASSERT (LegacyMemoryAddress == NULL); - AcpiS3Context = AllocateMemoryBelow4G (EfiReservedMemoryType, sizeof(*AcpiS3Context)); ASSERT (AcpiS3Context != NULL); AcpiS3ContextBuffer = (EFI_PHYSICAL_ADDRESS)(UINTN)AcpiS3Context; -- cgit v1.2.3