git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e43623b
)
x86 headers: protect page_32.h via __ASSEMBLY__
author
Ingo Molnar
<mingo@elte.hu>
Fri, 13 Feb 2009 12:36:47 +0000
(13:36 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 13 Feb 2009 12:36:47 +0000
(13:36 +0100)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/page_32.h
patch
|
blob
|
history
diff --git
a/arch/x86/include/asm/page_32.h
b/arch/x86/include/asm/page_32.h
index
b3f0bf7
..
da4e762
100644
(file)
--- 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>