Patchwork [Natty] UBUNTU: SAUCE: Revert "x86, hibernate: Initialize mmu_cr4_features during boot"

login
register
mail settings
Submitter Herton Ronaldo Krzesinski
Date April 18, 2011, 1:14 p.m.
Message ID <1303132460-13845-1-git-send-email-herton.krzesinski@canonical.com>
Download mbox | patch
Permalink /patch/91737/
State New
Headers show

Comments

Herton Ronaldo Krzesinski - April 18, 2011, 1:14 p.m.
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.

Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
---
 arch/x86/kernel/setup.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
Tim Gardner - April 18, 2011, 2:03 p.m.
On 04/18/2011 07:14 AM, Herton Ronaldo Krzesinski wrote:
> 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.
>
> Signed-off-by: Herton Ronaldo Krzesinski<herton.krzesinski@canonical.com>
> ---
>   arch/x86/kernel/setup.c |    5 -----
>   1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index 64d152c..d3cfe26 100644
> --- 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,

Natty is pretty well locked down, so this patch is gonna need a bug 
number and SRU verification.

Patch

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 64d152c..d3cfe26 100644
--- 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,