Commit-ID: b517d59e8e80c506c0809d76dbec8354b7de6c5c Gitweb: http://git.kernel.org/tip/b517d59e8e80c506c0809d76dbec8354b7de6c5c Author: "Ingo Molnar" <mingo@xxxxxxx> AuthorDate: Fri, 6 Mar 2009 15:37:07 +0100 Commit: Ingo Molnar <mingo@xxxxxxx> CommitDate: Fri, 6 Mar 2009 16:25:00 +0100 x86: unify noexec handling, fix Impact: build fix Move the nx_enabled variable to mm/init.c too. Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx> LKML-Reference: <1236265498.31324.12.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/mm/init.c | 2 ++ arch/x86/mm/init_32.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index e7d8bb5..4b799e8 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -22,6 +22,8 @@ int direct_gbpages #endif ; +int nx_enabled; + #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) static int disable_nx __initdata; diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 8ff1173..07bfd60 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -587,8 +587,6 @@ void zap_low_mappings(void) flush_tlb_all(); } -int nx_enabled; - pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP); EXPORT_SYMBOL_GPL(__supported_pte_mask); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|