rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Linux v3.12-rc2-83-g4b97280

Browse Source
This commit is contained in:
Josh Boyer 2013-09-26 09:53:29 -04:00
parent c294c6540b
commit 51825034b1
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
efi-dont-map-boot-services-on-32bit.patch
View File

@ -1,22 +0,0 @@
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;

9
kernel.spec
View File

@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 2 %define rcrev 2
# The git snapshot level # The git snapshot level
%define gitrev 1 %define gitrev 2
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0 %define rpmversion 3.%{upstream_sublevel}.0
%endif %endif
@ -688,8 +688,6 @@ Patch10000: fs-proc-devtree-remove_proc_entry.patch
Patch12016: disable-i8042-check-on-apple-mac.patch Patch12016: disable-i8042-check-on-apple-mac.patch
Patch13003: efi-dont-map-boot-services-on-32bit.patch
Patch14000: hibernate-freeze-filesystems.patch Patch14000: hibernate-freeze-filesystems.patch
Patch14010: lis3-improve-handling-of-null-rate.patch Patch14010: lis3-improve-handling-of-null-rate.patch
@ -1408,8 +1406,6 @@ ApplyPatch fs-proc-devtree-remove_proc_entry.patch
ApplyPatch disable-i8042-check-on-apple-mac.patch ApplyPatch disable-i8042-check-on-apple-mac.patch
ApplyPatch efi-dont-map-boot-services-on-32bit.patch
# FIXME: REBASE # FIXME: REBASE
#ApplyPatch hibernate-freeze-filesystems.patch #ApplyPatch hibernate-freeze-filesystems.patch
@ -2255,6 +2251,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Thu Sep 26 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc2.git2.1
- Linux v3.12-rc2-83-g4b97280
* Wed Sep 25 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc2.git1.1 * Wed Sep 25 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc2.git1.1
- Linux v3.12-rc2-33-g22356f4 - Linux v3.12-rc2-33-g22356f4
- Reenable debugging options. - Reenable debugging options.

2
sources
View File

@ -1,3 +1,3 @@
fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz
9e41ef3a4d18cde57a9e6af19d3d8cf6 patch-3.12-rc2.xz 9e41ef3a4d18cde57a9e6af19d3d8cf6 patch-3.12-rc2.xz
5e9ccf73a3493310380237990b987e8d patch-3.12-rc2-git1.xz c30215800018eefd99b6a90e51bb028f patch-3.12-rc2-git2.xz