Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev

[linux-2.6-omap-h63xx.git] / include / asm-m68k / processor.h

diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h
index 8455f778b601e64aa02f47be6c59a4cce35423ea..1f61ef53f0e0b068f2962f0a22d0f1dd4899f964 100644 (file)
--- a/include/asm-m68k/processor.h
+++ b/include/asm-m68k/processor.h
@@ -38,11 +38,12 @@ 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
+
+#ifdef __KERNEL__
+#define STACK_TOP      TASK_SIZE
+#define STACK_TOP_MAX  STACK_TOP
 #endif
 
 /* This decides where the kernel will search for a free chunk of vm