drop unneeded patch

kernel.spec

@@ -733,8 +733,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
 Patch12305: printk-do-not-mangle-valid-userspace-syslog-prefixes.patch
 Patch12306: scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
 
-Patch12307: x86-hibernate-initialize-mmu_cr4_features-during-boot.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1363,9 +1361,6 @@ ApplyPatch printk-do-not-mangle-valid-userspace-syslog-prefixes.patch
 
 ApplyPatch scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
 
-# fix hibernate broken by 2.6.38.y
-ApplyPatch x86-hibernate-initialize-mmu_cr4_features-during-boot.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1974,6 +1969,10 @@ fi
 # and build.
 
 %changelog
+* Fri Apr 15 2011 Kyle McMartin <kmcmartin@redhat.com>
+- Drop x86-hibernate-initialize-mmu_cr4_features-during-boot.patch, 
+  e5f15b45 was reverted in stable.
+
 * Thu Apr 14 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38.3-16
 - Linux 2.6.38.3
 - Drop merged patches:

x86-hibernate-initialize-mmu_cr4_features-during-boot.patch

@@ -1,46 +0,0 @@
-From 157db94a095cbfa84a1932d516930f4371e7fab5 Mon Sep 17 00:00:00 2001
-From: H. Peter Anvin <hpa@linux.intel.com>
-Date: Wed, 6 Apr 2011 13:10:02 -0700
-Subject: [PATCH] x86, hibernate: Initialize mmu_cr4_features during boot
-
-Restore the initialization of mmu_cr4_features during boot, which was
-removed without comment in checkin e5f15b45ddf3afa2bbbb10c7ea34fb32b6de0a0e
-
-x86: Cleanup highmap after brk is concluded
-
-thereby breaking resume from hibernate.  This restores previous
-functionality in approximately the same place, and corrects the
-reading of %cr4 on pre-CPUID hardware (%cr4 exists if and only if
-CPUID is supported.)
-
-However, part of the problem is that the hibernate suspend/resume
-sequence should manage the save/restore of %cr4 explicitly.
-
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Cc: Rafael J. Wysocki <rjw@sisk.pl>
-Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
-Cc: Yinghai Lu <yinghai@kernel.org>
-LKML-Reference: <201104020154.57136.rjw@sisk.pl>
----
- arch/x86/kernel/setup.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index e543fe9..4e59873 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -1013,6 +1013,11 @@ void __init setup_arch(char **cmdline_p)
- 	paging_init();
- 	x86_init.paging.pagetable_setup_done(swapper_pg_dir);
- 
-+	if (boot_cpu_data.cpuid_level >= 0) {
-+		/* A CPU has %cr4 if and only if it has CPUID */
-+		mmu_cr4_features = read_cr4();
-+	}
-+
- #ifdef CONFIG_X86_32
- 	/* sync back kernel address range */
- 	clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY,
--- 
-1.7.4.2
-