summaryrefslogtreecommitdiff
path: root/patches/fix-hibernate-resume-2.6.38.patch
diff options
context:
space:
mode:
authorTobias Powalowski <tobias@T-POWA-LX.(none)>2011-04-17 20:35:20 +0200
committerTobias Powalowski <tobias@T-POWA-LX.(none)>2011-04-17 20:35:20 +0200
commit194090a769d75392225987fa46fb2c52d2649450 (patch)
tree9eef59f4a24f1034482c5e04098333b1b7b0dcb3 /patches/fix-hibernate-resume-2.6.38.patch
parentee751891605129530527d57dc245b10efec20942 (diff)
bump to 2.6.38.3
Diffstat (limited to 'patches/fix-hibernate-resume-2.6.38.patch')
-rw-r--r--patches/fix-hibernate-resume-2.6.38.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/patches/fix-hibernate-resume-2.6.38.patch b/patches/fix-hibernate-resume-2.6.38.patch
new file mode 100644
index 0000000..d5fffd8
--- /dev/null
+++ b/patches/fix-hibernate-resume-2.6.38.patch
@@ -0,0 +1,18 @@
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 5a0484a..4be9b39 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -976,6 +976,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,
+
+ \ No newline at end of file