diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 13:36:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 13:36:47 +0100 |
| commit | beb6943d8df7ce9278282101af4e0f6f7b648451 (patch) | |
| tree | 70200a6b96a57a3085c101322a8c75cf827da8dc /arch/x86 | |
| parent | e43623b4ed1d0a1a86f0e05a2df8b9637b90ddd7 (diff) | |
| download | blackbird-op-linux-beb6943d8df7ce9278282101af4e0f6f7b648451.tar.gz blackbird-op-linux-beb6943d8df7ce9278282101af4e0f6f7b648451.zip | |
x86 headers: protect page_32.h via __ASSEMBLY__
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/page_32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h index b3f0bf79e843..da4e762406f7 100644 --- a/arch/x86/include/asm/page_32.h +++ b/arch/x86/include/asm/page_32.h @@ -3,6 +3,8 @@ #include <asm/page_32_types.h> +#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 <asm/mmx.h> |
