2 files changed, 12 insertions, 4 deletions

diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h
index df1575db32af..84b4b26df04c 100644
--- a/include/asm-m68k/processor.h
+++ b/include/asm-m68k/processor.h
@@ -14,6 +14,7 @@
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
 #include <linux/config.h>
+#include <linux/thread_info.h>
 #include <asm/segment.h>
 #include <asm/fpu.h>
 #include <asm/ptrace.h>
@@ -79,6 +80,7 @@ struct thread_struct {
         unsigned long  fpcntl[3];       /* fp control regs */
         unsigned char  fpstate[FPSTATESIZE];  /* floating point state */
         struct task_work work;
+        struct thread_info info;
 };
 
 #define INIT_THREAD  {                                                  \
diff --git a/include/asm-m68k/thread_info.h b/include/asm-m68k/thread_info.h
index 2aed24f6fd2e..4fdbf55f95e5 100644
--- a/include/asm-m68k/thread_info.h
+++ b/include/asm-m68k/thread_info.h
@@ -2,7 +2,6 @@
 #define _ASM_M68K_THREAD_INFO_H
 
 #include <asm/types.h>
-#include <asm/processor.h>
 #include <asm/page.h>
 
 struct thread_info {
@@ -35,14 +34,21 @@ struct thread_info {
 #define free_thread_info(ti)  free_pages((unsigned long)(ti),1)
 #endif /* PAGE_SHIFT == 13 */
 
-//#define init_thread_info      (init_task.thread.info)
+#define init_thread_info        (init_task.thread.info)
 #define init_stack              (init_thread_union.stack)
 
-#define current_thread_info()   (current->thread_info)
-
+#define task_thread_info(tsk)   (&(tsk)->thread.info)
+#define current_thread_info()   task_thread_info(current)
 
 #define __HAVE_THREAD_FUNCTIONS
 
+#define setup_thread_stack(p, org) ({                   \
+        *(struct task_struct **)(p)->thread_info = (p); \
+        task_thread_info(p)->task = (p);                \
+})
+
+#define end_of_stack(p) ((unsigned long *)(p)->thread_info + 1)
+
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
 #define TIF_DELAYED_TRACE       1       /* single step a syscall */
 #define TIF_NOTIFY_RESUME       2       /* resumption notification requested */