From bb4c1c4cc310a4c8871b78a65a6865de9d159fe8 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 22 Aug 2007 14:01:32 -0700
Subject: [PATCH] --- yaml --- r: 64240 b: refs/heads/master c:
 42b359238ebd359ed443fd80023e58e47be2224a h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-m68k/page.h      | 8 +++-----
 trunk/include/asm-m68k/processor.h | 4 ----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a7c3fbc64997..2f06607d5721 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d5e74fc7f44b1cdcd793496877c67a2a7a32a1e
+refs/heads/master: 42b359238ebd359ed443fd80023e58e47be2224a
diff --git a/trunk/include/asm-m68k/page.h b/trunk/include/asm-m68k/page.h
index fff1f455bdad..1431ea0b59e0 100644
--- a/trunk/include/asm-m68k/page.h
+++ b/trunk/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/trunk/include/asm-m68k/processor.h b/trunk/include/asm-m68k/processor.h
index 8455f778b601..4453ec379c5d 100644
--- a/trunk/include/asm-m68k/processor.h
+++ b/trunk/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.