From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763359AbZEHASb (ORCPT ); Thu, 7 May 2009 20:18:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758594AbZEHAKT (ORCPT ); Thu, 7 May 2009 20:10:19 -0400 Received: from adsl-76-233-236-102.dsl.pltn13.sbcglobal.net ([76.233.236.102]:52711 "EHLO abulafia.goop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754946AbZEHAJ6 (ORCPT ); Thu, 7 May 2009 20:09:58 -0400 From: Jeremy Fitzhardinge To: Ingo Molnar Cc: the arch/x86 maintainers , Linux Kernel Mailing List , Xen-devel , Ian Campbell , Jeremy Fitzhardinge Subject: [PATCH 06/16] xen: disable PAT Date: Thu, 7 May 2009 14:10:43 -0700 Message-Id: <1241730653-4688-7-git-send-email-jeremy@goop.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241730653-4688-1-git-send-email-jeremy@goop.org> References: <1241730653-4688-1-git-send-email-jeremy@goop.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ian Campbell Impact: disable PAT under Xen Xen imposes a particular PAT layout on all paravirtual guests which does not match the layout Linux would like to use. Force PAT to be disabled until this is resolved. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge --- arch/x86/include/asm/pat.h | 5 +++++ arch/x86/mm/pat.c | 5 ----- arch/x86/xen/enlighten.c | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/pat.h b/arch/x86/include/asm/pat.h index 2cd07b9..d434a4e 100644 --- a/arch/x86/include/asm/pat.h +++ b/arch/x86/include/asm/pat.h @@ -6,8 +6,13 @@ #ifdef CONFIG_X86_PAT extern int pat_enabled; +extern void pat_disable(const char *reason); #else static const int pat_enabled; +static inline void pat_disable(const char *reason) +{ + (void)reason; +} #endif extern void pat_init(void); diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 640339e..4d2a4df 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -43,11 +43,6 @@ static int __init nopat(char *str) return 0; } early_param("nopat", nopat); -#else -static inline void pat_disable(const char *reason) -{ - (void)reason; -} #endif diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index f917381..48c91dc 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -49,6 +49,7 @@ #include #include #include +#include #include "xen-ops.h" #include "mmu.h" @@ -1034,6 +1035,8 @@ asmlinkage void __init xen_start_kernel(void) add_preferred_console("hvc", 0, NULL); } + pat_disable("PAT disabled on Xen"); + xen_raw_console_write("about to get started...\n"); /* Start the world */ -- 1.6.0.6