lkml.org 
[lkml]   [2009]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 06/15] xen: disable PAT
Date
From: Ian Campbell <ian.campbell@citrix.com>

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 <ian.campbell@citrix.com>
---
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 2ed3715..ea1d6bb 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 19af31b..731c096 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -48,6 +48,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/reboot.h>
+#include <asm/pat.h>

#include "xen-ops.h"
#include "mmu.h"
@@ -1029,6 +1030,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


\
 
 \ /
  Last update: 2009-03-13 17:37    [W:0.034 / U:0.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site