From: Ingo Molnar Date: Fri, 13 Feb 2009 12:36:47 +0000 (+0100) Subject: x86 headers: protect page_32.h via __ASSEMBLY__ X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=beb6943d8df7ce9278282101af4e0f6f7b648451;p=linux-2.6-omap-h63xx.git x86 headers: protect page_32.h via __ASSEMBLY__ Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h index b3f0bf79e84..da4e762406f 100644 --- a/arch/x86/include/asm/page_32.h +++ b/arch/x86/include/asm/page_32.h @@ -3,6 +3,8 @@ #include +#ifndef __ASSEMBLY__ + #ifdef CONFIG_HUGETLB_PAGE #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA #endif @@ -19,8 +21,6 @@ extern unsigned long __phys_addr(unsigned long); #define pfn_valid(pfn) ((pfn) < max_mapnr) #endif /* CONFIG_FLATMEM */ -#ifndef __ASSEMBLY__ - #ifdef CONFIG_X86_USE_3DNOW #include