]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[PATCH] Fix 'make headers_check' on ia64
authorGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 19 Sep 2006 03:12:23 +0000 (20:12 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 19 Sep 2006 14:59:59 +0000 (07:59 -0700)
Fix 'make headers_check' on m68k

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/asm-m68k/page.h

index db017f838c2913dcff9ac66522cec7cbed82d64e..fcc165ddd09e11e789a76c04208faef6b93937ee 100644 (file)
@@ -2,6 +2,8 @@
 #define _M68K_PAGE_H
 
 
+#ifdef __KERNEL__
+
 /* PAGE_SHIFT determines the page size */
 #ifndef CONFIG_SUN3
 #define PAGE_SHIFT     (12)
@@ -15,8 +17,6 @@
 #endif
 #define PAGE_MASK      (~(PAGE_SIZE-1))
 
-#ifdef __KERNEL__
-
 #include <asm/setup.h>
 
 #if PAGE_SHIFT < 13
@@ -175,8 +175,8 @@ static inline void *__va(unsigned long x)
 #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#endif /* __KERNEL__ */
-
 #include <asm-generic/page.h>
 
+#endif /* __KERNEL__ */
+
 #endif /* _M68K_PAGE_H */