summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-26 09:53:29 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-26 09:53:29 -0400
commit51825034b196039223254cff33328e6caec4b69b (patch)
tree04d73fa46057b3beb5ca8a8420c7798ca9a33038
parentc294c6540b441ddad31131edf73005e6eb7bb202 (diff)
downloadkernel-51825034b196039223254cff33328e6caec4b69b.tar.gz
kernel-51825034b196039223254cff33328e6caec4b69b.tar.xz
kernel-51825034b196039223254cff33328e6caec4b69b.zip
Linux v3.12-rc2-83-g4b97280
-rw-r--r--efi-dont-map-boot-services-on-32bit.patch22
-rw-r--r--kernel.spec9
-rw-r--r--sources2
3 files changed, 5 insertions, 28 deletions
diff --git a/efi-dont-map-boot-services-on-32bit.patch b/efi-dont-map-boot-services-on-32bit.patch
deleted file mode 100644
index 7cc614992..000000000
--- a/efi-dont-map-boot-services-on-32bit.patch
+++ /dev/null
@@ -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;
diff --git a/kernel.spec b/kernel.spec
index 33391e124..ccca48402 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -688,8 +688,6 @@ Patch10000: fs-proc-devtree-remove_proc_entry.patch
Patch12016: disable-i8042-check-on-apple-mac.patch
-Patch13003: efi-dont-map-boot-services-on-32bit.patch
-
Patch14000: hibernate-freeze-filesystems.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 efi-dont-map-boot-services-on-32bit.patch
-
# FIXME: REBASE
#ApplyPatch hibernate-freeze-filesystems.patch
@@ -2255,6 +2251,9 @@ fi
# ||----w |
# || ||
%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
- Linux v3.12-rc2-33-g22356f4
- Reenable debugging options.
diff --git a/sources b/sources
index 87e26e3f3..532894fda 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz
9e41ef3a4d18cde57a9e6af19d3d8cf6 patch-3.12-rc2.xz
-5e9ccf73a3493310380237990b987e8d patch-3.12-rc2-git1.xz
+c30215800018eefd99b6a90e51bb028f patch-3.12-rc2-git2.xz