commit 42b359238ebd359ed443fd80023e58e47be2224a
author Geert Uytterhoeven <geert@linux-m68k.org> Wed Aug 22 14:01:32 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Aug 22 19:52:45 2007 -0700
tree 464fc384e425d3d4a5236d122fcd09f47049c512
parent 0d5e74fc7f44b1cdcd793496877c67a2a7a32a1e

m68k: Use _AC() instead of #ifdef __ASSEMBLY__

m68k: Use _AC() instead of #ifdef __ASSEMBLY__ hackery when needed, remove
hackery when unused.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

include/asm-m68k/page.h

diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h
index fff1f45..1431ea0 100644
--- a/include/asm-m68k/page.h
+++ b/include/asm-m68k/page.h
@@ -4,17 +4,15 @@
 
 #ifdef __KERNEL__
 
+#include <linux/const.h>
+
 /* PAGE_SHIFT determines the page size */
 #ifndef CONFIG_SUN3
 #define PAGE_SHIFT	(12)
 #else
 #define PAGE_SHIFT	(13)
 #endif
-#ifdef __ASSEMBLY__
-#define PAGE_SIZE	(1 << PAGE_SHIFT)
-#else
-#define PAGE_SIZE	(1UL << PAGE_SHIFT)
-#endif
+#define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
 #include <asm/setup.h>