From patchwork Mon Apr 18 13:14:20 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: 91737 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 0E9B4B6F6C for ; Mon, 18 Apr 2011 23:14:54 +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 1QBoHc-0002tt-5o; Mon, 18 Apr 2011 13:14:28 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QBoHX-0002tn-Gg for kernel-team@lists.ubuntu.com; Mon, 18 Apr 2011 13:14:23 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QBoHX-0000dH-Eu for ; Mon, 18 Apr 2011 13:14:23 +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 1QBoHX-0006dW-0h for kernel-team@lists.ubuntu.com; Mon, 18 Apr 2011 13:14:23 +0000 From: Herton Ronaldo Krzesinski To: Ubuntu Kernel Team Subject: [PATCH] [Natty] UBUNTU: SAUCE: Revert "x86, hibernate: Initialize mmu_cr4_features during boot" Date: Mon, 18 Apr 2011 10:14:20 -0300 Message-Id: <1303132460-13845-1-git-send-email-herton.krzesinski@canonical.com> X-Mailer: git-send-email 1.7.1 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: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 --- 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,