Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[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 352799e71f0846eed8a176cdd681391e677ad3a1..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
@@ -71,10 +72,10 @@ struct thread_struct {
 };
 
 #define INIT_THREAD  {                                                 \
-       ksp:    sizeof(init_stack) + (unsigned long) init_stack,        \
-       sr:     PS_S,                                                   \
-       fs:     __KERNEL_DS,                                            \
-       info:   INIT_THREAD_INFO(init_task)                             \
+       .ksp    = sizeof(init_stack) + (unsigned long) init_stack,      \
+       .sr     = PS_S,                                                 \
+       .fs     = __KERNEL_DS,                                          \
+       .info   = INIT_THREAD_INFO(init_task),                          \
 }
 
 /*