lkml.org 
[lkml]   [2007]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [39/58] i386: minor nx handling adjustment
    Date

    From: "Jan Beulich" <jbeulich@novell.com>
    Constrain __supported_pte_mask and NX handling to just the PAE kernel.

    Signed-off-by: Jan Beulich <jbeulich@novell.com>
    Signed-off-by: Andi Kleen <ak@suse.de>

    arch/i386/mm/init.c | 7 ++++---
    include/asm-i386/page.h | 1 -
    2 files changed, 4 insertions(+), 4 deletions(-)

    Index: linux/arch/i386/mm/init.c
    ===================================================================
    --- linux.orig/arch/i386/mm/init.c
    +++ linux/arch/i386/mm/init.c
    @@ -471,6 +471,10 @@ void zap_low_mappings (void)
    flush_tlb_all();
    }

    +int nx_enabled = 0;
    +
    +#ifdef CONFIG_X86_PAE
    +
    static int disable_nx __initdata = 0;
    u64 __supported_pte_mask __read_mostly = ~_PAGE_NX;
    EXPORT_SYMBOL_GPL(__supported_pte_mask);
    @@ -500,9 +504,6 @@ static int __init noexec_setup(char *str
    }
    early_param("noexec", noexec_setup);

    -int nx_enabled = 0;
    -#ifdef CONFIG_X86_PAE
    -
    static void __init set_nx(void)
    {
    unsigned int v[4], l, h;
    Index: linux/include/asm-i386/page.h
    ===================================================================
    --- linux.orig/include/asm-i386/page.h
    +++ linux/include/asm-i386/page.h
    @@ -44,7 +44,6 @@
    extern int nx_enabled;

    #ifdef CONFIG_X86_PAE
    -extern unsigned long long __supported_pte_mask;
    typedef struct { unsigned long pte_low, pte_high; } pte_t;
    typedef struct { unsigned long long pmd; } pmd_t;
    typedef struct { unsigned long long pgd; } pgd_t;
    -
    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/
    \
     
     \ /
      Last update: 2007-07-19 12:19    [W:4.055 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site