summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2007-08-22 14:01:32 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-22 19:52:45 -0700
commit42b359238ebd359ed443fd80023e58e47be2224a (patch)
tree464fc384e425d3d4a5236d122fcd09f47049c512 /include/asm-m68k
parent0d5e74fc7f44b1cdcd793496877c67a2a7a32a1e (diff)
downloadop-kernel-dev-42b359238ebd359ed443fd80023e58e47be2224a.zip
op-kernel-dev-42b359238ebd359ed443fd80023e58e47be2224a.tar.gz
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>
Diffstat (limited to 'include/asm-m68k')
-rw-r--r--include/asm-m68k/page.h8
-rw-r--r--include/asm-m68k/processor.h4
2 files changed, 3 insertions, 9 deletions
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>
diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h
index 8455f77..4453ec3 100644
--- a/include/asm-m68k/processor.h
+++ b/include/asm-m68k/processor.h
@@ -38,12 +38,8 @@ static inline void wrusp(unsigned long usp)
#ifndef CONFIG_SUN3
#define TASK_SIZE (0xF0000000UL)
#else
-#ifdef __ASSEMBLY__
-#define TASK_SIZE (0x0E000000)
-#else
#define TASK_SIZE (0x0E000000UL)
#endif
-#endif
/* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
OpenPOWER on IntegriCloud