1 files changed, 10 insertions, 8 deletions

diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
index 568facf30276..46460fa15d5c 100644
--- a/arch/m68k/include/asm/processor.h
+++ b/arch/m68k/include/asm/processor.h
@@ -48,10 +48,12 @@ static inline void wrusp(unsigned long usp)
  * so don't change it unless you know what you are doing.
  */
 #ifdef CONFIG_MMU
-#ifndef CONFIG_SUN3
-#define TASK_SIZE       (0xF0000000UL)
-#else
+#if defined(CONFIG_COLDFIRE)
+#define TASK_SIZE       (0xC0000000UL)
+#elif defined(CONFIG_SUN3)
 #define TASK_SIZE       (0x0E000000UL)
+#else
+#define TASK_SIZE       (0xF0000000UL)
 #endif
 #else
 #define TASK_SIZE       (0xFFFFFFFFUL)
@@ -66,10 +68,12 @@ static inline void wrusp(unsigned long usp)
  * space during mmap's.
  */
 #ifdef CONFIG_MMU
-#ifndef CONFIG_SUN3
-#define TASK_UNMAPPED_BASE      0xC0000000UL
-#else
+#if defined(CONFIG_COLDFIRE)
+#define TASK_UNMAPPED_BASE      0x60000000UL
+#elif defined(CONFIG_SUN3)
 #define TASK_UNMAPPED_BASE      0x0A000000UL
+#else
+#define TASK_UNMAPPED_BASE      0xC0000000UL
 #endif
 #define TASK_UNMAPPED_ALIGN(addr, off)  PAGE_ALIGN(addr)
 #else
@@ -88,14 +92,12 @@ struct thread_struct {
         unsigned long  fp[8*3];
         unsigned long  fpcntl[3];       /* fp control regs */
         unsigned char  fpstate[FPSTATESIZE];  /* floating point state */
-        struct thread_info info;
 };
 
 #define INIT_THREAD  {                                                  \
         .ksp    = sizeof(init_stack) + (unsigned long) init_stack,      \
         .sr     = PS_S,                                                 \
         .fs     = __KERNEL_DS,                                          \
-        .info   = INIT_THREAD_INFO(init_task),                          \
 }
 
 #ifdef CONFIG_MMU