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, 3:38 p.m.
Message ID <20110418153848.GB7621@herton-IdeaPad-Y430>
Download mbox | patch
Permalink /patch/91792/
State New
Headers show

Comments

Herton Ronaldo Krzesinski - April 18, 2011, 3:38 p.m.
On Mon, Apr 18, 2011 at 08:03:18AM -0600, Tim Gardner wrote:
> Natty is pretty well locked down, so this patch is gonna need a bug
> number and SRU verification.

Ok, opened now: http://bugs.launchpad.net/bugs/764758

Updated patch attached.
Tim Gardner - April 18, 2011, 4:07 p.m.
On 04/18/2011 09:38 AM, Herton Ronaldo Krzesinski wrote:
> On Mon, Apr 18, 2011 at 08:03:18AM -0600, Tim Gardner wrote:
>> Natty is pretty well locked down, so this patch is gonna need a bug
>> number and SRU verification.
>
> Ok, opened now: http://bugs.launchpad.net/bugs/764758
>
> Updated patch attached.
>

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Leann Ogasawara - April 27, 2011, 3:56 p.m.
On Mon, 2011-04-18 at 10:07 -0600, Tim Gardner wrote:
> On 04/18/2011 09:38 AM, Herton Ronaldo Krzesinski wrote:
> > On Mon, Apr 18, 2011 at 08:03:18AM -0600, Tim Gardner wrote:
> >> Natty is pretty well locked down, so this patch is gonna need a bug
> >> number and SRU verification.
> >
> > Ok, opened now: http://bugs.launchpad.net/bugs/764758
> >
> > Updated patch attached.
> >
> 
> Acked-by: Tim Gardner <tim.gardner@canonical.com>

Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner - April 27, 2011, 4:10 p.m.
On 04/18/2011 09:38 AM, Herton Ronaldo Krzesinski wrote:
> On Mon, Apr 18, 2011 at 08:03:18AM -0600, Tim Gardner wrote:
>> Natty is pretty well locked down, so this patch is gonna need a bug
>> number and SRU verification.
>
> Ok, opened now: http://bugs.launchpad.net/bugs/764758
>
> Updated patch attached.
>

applied

Patch

From cc5a19bad54e8efc4a9a0323c281d807a72a090d Mon Sep 17 00:00:00 2001
From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Date: Mon, 18 Apr 2011 10:01:16 -0300
Subject: [PATCH] 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>
---
 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,
-- 
1.7.1