UBUNTU: SAUCE: Revert "x86, hibernate: Initialize mmu_cr4_features during boot"

This reverts commit 60d3abc3a55c37376c989e65f87fe25f78281793.

Since the update to 2.6.38.3, this fix isn't needed, as the problematic
commit ("x86: Cleanup highmap after brk is concluded") which required it
got reverted. To keep things clean, revert the fix too.

BugLink: http://bugs.launchpad.net/bugs/764758
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 64d152c..d3cfe26 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1008,11 +1008,6 @@ 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,