lkml.org 
[lkml]   [2009]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/19] 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 9709fdf..d8be231 100644
    --- a/arch/x86/include/asm/pat.h
    +++ b/arch/x86/include/asm/pat.h
    @@ -5,8 +5,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 05f9aef..37df685 100644
    --- a/arch/x86/mm/pat.c
    +++ b/arch/x86/mm/pat.c
    @@ -42,11 +42,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 468aa23..1b89d1c 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"
    @@ -986,6 +987,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-02-18 12:23    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean