From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 30 May 2011 14:28:42 +0000 (+0800)
Subject: stable queue
X-Git-Tag: v2.6.39.1~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c814df621eaf4b5c16f488056fa473b770f62a48;p=thirdparty%2Fkernel%2Fstable-queue.git

stable queue
---

diff --git a/queue-2.6.39/x86-efi-retain-boot-service-code-until-after-switching-to.patch b/queue-2.6.39/x86-efi-retain-boot-service-code-until-after-switching-to.patch
index 859b917bb74..71284fe5e75 100644
--- a/queue-2.6.39/x86-efi-retain-boot-service-code-until-after-switching-to.patch
+++ b/queue-2.6.39/x86-efi-retain-boot-service-code-until-after-switching-to.patch
@@ -148,7 +148,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		md = p;
 -		if (md->type == EFI_RUNTIME_SERVICES_CODE) {
 +		if (md->type == EFI_RUNTIME_SERVICES_CODE ||
-+		    md->type == EFI_BOOT_SERVICES_CODE)
++		    md->type == EFI_BOOT_SERVICES_CODE) {
  			unsigned long end;
  			end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT);
  			early_mapping_set_exec(md->phys_addr, end, executable);