X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-blackfin%2Fpage.h;h=d5c9d1433781233e75871debc2bdebdfaf994b17;hb=7a8c6ad918e9c598bf3b799f1a0d5ee4dee59ca3;hp=ffad947f1b2a9c7884f7fea9efd65dedf82f64b7;hpb=ba7cc09c9c9e29a57045dc5bbf843ac1cfad3283;p=linux-2.6

diff --git a/include/asm-blackfin/page.h b/include/asm-blackfin/page.h
index ffad947f1b..d5c9d14337 100644
--- a/include/asm-blackfin/page.h
+++ b/include/asm-blackfin/page.h
@@ -4,11 +4,13 @@
 /* PAGE_SHIFT determines the page size */
 
 #define PAGE_SHIFT	12
+#ifdef __ASSEMBLY__
+#define PAGE_SIZE	(1 << PAGE_SHIFT)
+#else
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
+#endif
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
-#ifdef __KERNEL__
-
 #include <asm/setup.h>
 
 #ifndef __ASSEMBLY__
@@ -84,6 +86,5 @@ extern unsigned long memory_end;
 #include <asm-generic/page.h>
 
 #endif				/* __ASSEMBLY__ */
-#endif				/* __KERNEL__ */
 
 #endif				/* _BLACKFIN_PAGE_H */