diff --git a/efi-dont-map-boot-services-on-32bit.patch b/efi-dont-map-boot-services-on-32bit.patch new file mode 100644 index 000000000..7cc614992 --- /dev/null +++ b/efi-dont-map-boot-services-on-32bit.patch @@ -0,0 +1,22 @@ +diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c +index 3ae4128..ff7dc70 100644 +--- a/arch/x86/platform/efi/efi.c ++++ b/arch/x86/platform/efi/efi.c +@@ -659,10 +659,13 @@ void __init efi_enter_virtual_mode(void) + + for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { + md = p; +- if (!(md->attribute & EFI_MEMORY_RUNTIME) && +- md->type != EFI_BOOT_SERVICES_CODE && +- md->type != EFI_BOOT_SERVICES_DATA) +- continue; ++ if (!(md->attribute & EFI_MEMORY_RUNTIME)) { ++#ifdef CONFIG_X86_64 ++ if (md->type != EFI_BOOT_SERVICES_CODE && ++ md->type != EFI_BOOT_SERVICES_DATA) ++#endif ++ continue; ++ } + + size = md->num_pages << EFI_PAGE_SHIFT; + end = md->phys_addr + size; diff --git a/kernel.spec b/kernel.spec index 6ab3c73e4..b675ba66e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 4 +%global baserelease 5 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -700,6 +700,7 @@ Patch13000: fix-scsi_dispatch_cmd.patch Patch13001: epoll-fix-spurious-lockdep-warnings.patch Patch13002: hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch +Patch13003: efi-dont-map-boot-services-on-32bit.patch Patch20000: utrace.patch %endif @@ -1286,6 +1287,8 @@ ApplyPatch fix-scsi_dispatch_cmd.patch ApplyPatch epoll-fix-spurious-lockdep-warnings.patch ApplyPatch hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch +ApplyPatch efi-dont-map-boot-services-on-32bit.patch + # utrace. ApplyPatch utrace.patch @@ -1898,6 +1901,9 @@ fi # and build. %changelog +* Fri Aug 05 2011 Josh Boyer +- Add patch for rhbz 726701 from Matthew Garrett + * Thu Aug 04 2011 Dave Jones - Drop neuter_intel_microcode_load.patch (rhbz 690930)