Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757824AbYKMTr5 (ORCPT ); Thu, 13 Nov 2008 14:47:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754702AbYKMTem (ORCPT ); Thu, 13 Nov 2008 14:34:42 -0500 Received: from gw.goop.org ([64.81.55.164]:34426 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754428AbYKMTeR (ORCPT ); Thu, 13 Nov 2008 14:34:17 -0500 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 26 of 38] xen: forcibly disable PAT support X-Mercurial-Node: 5e0d410e482fd53786aa899f1dd80b747315061f Message-Id: <5e0d410e482fd53786aa.1226603424@abulafia.goop.org> In-Reply-To: Date: Thu, 13 Nov 2008 11:10:24 -0800 From: Jeremy Fitzhardinge To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Xen-devel , the arch/x86 maintainers , Ian Campbell Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1811 Lines: 62 From: Ian Campbell 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 --- arch/x86/include/asm/pat.h | 4 ++-- arch/x86/xen/enlighten.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/pat.h b/arch/x86/include/asm/pat.h --- a/arch/x86/include/asm/pat.h +++ b/arch/x86/include/asm/pat.h @@ -6,9 +6,11 @@ #ifdef CONFIG_X86_PAT extern int pat_enabled; extern void validate_pat_support(struct cpuinfo_x86 *c); +extern void pat_disable(char *reason); #else static const int pat_enabled; static inline void validate_pat_support(struct cpuinfo_x86 *c) { } +static inline void pat_disable(char *reason) { } #endif extern void pat_init(void); @@ -17,6 +19,4 @@ unsigned long req_type, unsigned long *ret_type); extern int free_memtype(u64 start, u64 end); -extern void pat_disable(char *reason); - #endif /* _ASM_X86_PAT_H */ diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "xen-ops.h" #include "mmu.h" @@ -1743,6 +1744,8 @@ add_preferred_console("hvc", 0, NULL); } + pat_disable("PAT disabled on Xen"); + xen_raw_console_write("about to get started...\n"); /* Start the world */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/