rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix suspend to disk broken by 2.6.38.y

Browse Source
This commit is contained in:
Kyle McMartin 2011-04-11 20:44:23 -04:00
parent e92d339e55
commit 9dde67c33a
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel.spec
View File

@ -738,6 +738,8 @@ 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
@ -1373,6 +1375,9 @@ 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
@ -1981,6 +1986,9 @@ fi
# and build.
%changelog
* Tue Apr 12 2011 Kyle McMartin <kmcmartin@redhat.com>
- fix hibernate which was broken by 2.6.38.y (korg#32222)
* Tue Apr 12 2011 Ben Skeggs <bskeggs@redhat.com> 2.6.38-2.14
- nouveau: correct lock ordering problem

46
x86-hibernate-initialize-mmu_cr4_features-during-boot.patch Normal file
View File

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