From patchwork Mon Apr 18 15:38:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herton Ronaldo Krzesinski X-Patchwork-Id: 91792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 1E02AB6F5F for ; Tue, 19 Apr 2011 01:39:27 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QBqXP-0006JN-5n; Mon, 18 Apr 2011 15:38:55 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QBqXN-0006JH-3G for kernel-team@lists.ubuntu.com; Mon, 18 Apr 2011 15:38:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QBqXN-0004Uy-1G; Mon, 18 Apr 2011 15:38:53 +0000 Received: from 201.47.31.64.dynamic.adsl.gvt.net.br ([201.47.31.64] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1QBqXM-0002II-Bo; Mon, 18 Apr 2011 15:38:53 +0000 Date: Mon, 18 Apr 2011 12:38:49 -0300 From: Herton Ronaldo Krzesinski To: Tim Gardner Subject: Re: [PATCH] [Natty] UBUNTU: SAUCE: Revert "x86, hibernate: Initialize mmu_cr4_features during boot" Message-ID: <20110418153848.GB7621@herton-IdeaPad-Y430> References: <1303132460-13845-1-git-send-email-herton.krzesinski@canonical.com> <4DAC44A6.10404@canonical.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4DAC44A6.10404@canonical.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Ubuntu Kernel Team X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 Acked-by: Leann Ogasawara From cc5a19bad54e8efc4a9a0323c281d807a72a090d Mon Sep 17 00:00:00 2001 From: Herton Ronaldo Krzesinski 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 --- 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