1 files changed, 17 insertions, 74 deletions
diff --git a/include/asm-m68k/thread_info.h b/include/asm-m68k/thread_info.h
index 2aed24f6fd2e..9532ca3c45cb 100644
--- a/include/asm-m68k/thread_info.h
+++ b/include/asm-m68k/thread_info.h
@@ -2,17 +2,15 @@
 #define _ASM_M68K_THREAD_INFO_H
 #include <asm/types.h>
-#include <asm/processor.h>
 #include <asm/page.h>
 struct thread_info {
        struct task_struct      *task;          /* main task structure */
+        unsigned long           flags;
        struct exec_domain      *exec_domain;   /* execution domain */
        int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
        __u32 cpu; /* should always be 0 on m68k */
        struct restart_block    restart_block;
-        __u8                    supervisor_stack[0];
 };
 #define PREEMPT_ACTIVE          0x4000000
@@ -35,84 +33,29 @@ 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 TIF_SYSCALL_TRACE       0       /* syscall trace active */
+#define setup_thread_stack(p, org) ({                   \
-#define TIF_DELAYED_TRACE       1       /* single step a syscall */
+        *(struct task_struct **)(p)->thread_info = (p); \
-#define TIF_NOTIFY_RESUME       2       /* resumption notification requested */
+        task_thread_info(p)->task = (p);                \
-#define TIF_SIGPENDING          3       /* signal pending */
-#define TIF_NEED_RESCHED        4       /* rescheduling necessary */
-#define TIF_MEMDIE              5
-extern int thread_flag_fixme(void);
-/*
- * flag set/clear/test wrappers
- * - pass TIF_xxxx constants to these functions
- */
-#define __set_tsk_thread_flag(tsk, flag, val) ({        \
-        switch (flag) {                                 \
-        case TIF_SIGPENDING:                            \
-                tsk->thread.work.sigpending = val;      \
-                break;                                  \
-        case TIF_NEED_RESCHED:                          \
-                tsk->thread.work.need_resched = val;    \
-                break;                                  \
-        case TIF_SYSCALL_TRACE:                         \
-                tsk->thread.work.syscall_trace = val;   \
-                break;                                  \
-        case TIF_MEMDIE:                                \
-                tsk->thread.work.memdie = val;          \
-                break;                                  \
-        default:                                        \
-                thread_flag_fixme();                    \
-        }                                               \
 })
-#define __get_tsk_thread_flag(tsk, flag) ({             \
+#define end_of_stack(p) ((unsigned long *)(p)->thread_info + 1)
-        int ___res;                                     \
-        switch (flag) {                                 \
-        case TIF_SIGPENDING:                            \
-                ___res = tsk->thread.work.sigpending;   \
-                break;                                  \
-        case TIF_NEED_RESCHED:                          \
-                ___res = tsk->thread.work.need_resched; \
-                break;                                  \
-        case TIF_SYSCALL_TRACE:                         \
-                ___res = tsk->thread.work.syscall_trace;\
-                break;                                  \
-        case TIF_MEMDIE:                                \
-                ___res = tsk->thread.work.memdie;\
-                break;                                  \
-        default:                                        \
-                ___res = thread_flag_fixme();           \
-        }                                               \
-        ___res;                                         \
-})
-#define __get_set_tsk_thread_flag(tsk, flag, val) ({    \
-        int __res = __get_tsk_thread_flag(tsk, flag);   \
-        __set_tsk_thread_flag(tsk, flag, val);          \
-        __res;                                          \
-})
-#define set_tsk_thread_flag(tsk, flag) __set_tsk_thread_flag(tsk, flag, ~0)
+/* entry.S relies on these definitions!
-#define clear_tsk_thread_flag(tsk, flag) __set_tsk_thread_flag(tsk, flag, 0)
+ * bits 0-7 are tested at every exception exit
-#define test_and_set_tsk_thread_flag(tsk, flag) __get_set_tsk_thread_flag(tsk, flag, ~0)
+ * bits 8-15 are also tested at syscall exit
-#define test_tsk_thread_flag(tsk, flag) __get_tsk_thread_flag(tsk, flag)
+ */
+#define TIF_SIGPENDING          6       /* signal pending */
-#define set_thread_flag(flag) set_tsk_thread_flag(current, flag)
+#define TIF_NEED_RESCHED        7       /* rescheduling necessary */
-#define clear_thread_flag(flag) clear_tsk_thread_flag(current, flag)
+#define TIF_DELAYED_TRACE       14      /* single step a syscall */
-#define test_thread_flag(flag) test_tsk_thread_flag(current, flag)
+#define TIF_SYSCALL_TRACE       15      /* syscall trace active */
+#define TIF_MEMDIE              16
-#define set_need_resched() set_thread_flag(TIF_NEED_RESCHED)
-#define clear_need_resched() clear_thread_flag(TIF_NEED_RESCHED)
 #endif  /* _ASM_M68K_THREAD_INFO_H */

diff --git a/include/asm-m68k/thread_info.h b/include/asm-m68k/thread_info.h index 2aed24f6fd2e..9532ca3c45cb 100644 --- a/include/asm-m68k/thread_info.h +++ b/include/asm-m68k/thread_info.h
@@ -2,17 +2,15 @@
2	#define _ASM_M68K_THREAD_INFO_H	2	#define _ASM_M68K_THREAD_INFO_H
3		3
4	#include <asm/types.h>	4	#include <asm/types.h>
5	#include <asm/processor.h>
6	#include <asm/page.h>	5	#include <asm/page.h>
7		6
8	struct thread_info {	7	struct thread_info {
9	struct task_struct task; / main task structure */	8	struct task_struct task; / main task structure */
		9	unsigned long flags;
10	struct exec_domain exec_domain; / execution domain */	10	struct exec_domain exec_domain; / execution domain */
11	int preempt_count; /* 0 => preemptable, <0 => BUG */	11	int preempt_count; /* 0 => preemptable, <0 => BUG */
12	__u32 cpu; /* should always be 0 on m68k */	12	__u32 cpu; /* should always be 0 on m68k */
13	struct restart_block restart_block;	13	struct restart_block restart_block;
14
15	__u8 supervisor_stack[0];
16	};	14	};
17		15
18	#define PREEMPT_ACTIVE 0x4000000	16	#define PREEMPT_ACTIVE 0x4000000
@@ -35,84 +33,29 @@ struct thread_info {
35	#define free_thread_info(ti) free_pages((unsigned long)(ti),1)	33	#define free_thread_info(ti) free_pages((unsigned long)(ti),1)
36	#endif /* PAGE_SHIFT == 13 */	34	#endif /* PAGE_SHIFT == 13 */
37		35
38	//#define init_thread_info (init_task.thread.info)	36	#define init_thread_info (init_task.thread.info)
39	#define init_stack (init_thread_union.stack)	37	#define init_stack (init_thread_union.stack)
40		38
41	#define current_thread_info() (current->thread_info)	39	#define task_thread_info(tsk) (&(tsk)->thread.info)
42		40	#define current_thread_info() task_thread_info(current)
43		41
44	#define __HAVE_THREAD_FUNCTIONS	42	#define __HAVE_THREAD_FUNCTIONS
45		43
46	#define TIF_SYSCALL_TRACE 0 /* syscall trace active */	44	#define setup_thread_stack(p, org) ({ \
47	#define TIF_DELAYED_TRACE 1 /* single step a syscall */	45	(struct task_struct *)(p)->thread_info = (p); \
48	#define TIF_NOTIFY_RESUME 2 /* resumption notification requested */	46	task_thread_info(p)->task = (p); \
49	#define TIF_SIGPENDING 3 /* signal pending */
50	#define TIF_NEED_RESCHED 4 /* rescheduling necessary */
51	#define TIF_MEMDIE 5
52
53	extern int thread_flag_fixme(void);
54
55	/*
56	* flag set/clear/test wrappers
57	* - pass TIF_xxxx constants to these functions
58	*/
59
60	#define __set_tsk_thread_flag(tsk, flag, val) ({ \
61	switch (flag) { \
62	case TIF_SIGPENDING: \
63	tsk->thread.work.sigpending = val; \
64	break; \
65	case TIF_NEED_RESCHED: \
66	tsk->thread.work.need_resched = val; \
67	break; \
68	case TIF_SYSCALL_TRACE: \
69	tsk->thread.work.syscall_trace = val; \
70	break; \
71	case TIF_MEMDIE: \
72	tsk->thread.work.memdie = val; \
73	break; \
74	default: \
75	thread_flag_fixme(); \
76	} \
77	})	47	})
78		48
79	#define __get_tsk_thread_flag(tsk, flag) ({ \	49	#define end_of_stack(p) ((unsigned long *)(p)->thread_info + 1)
80	int ___res; \
81	switch (flag) { \
82	case TIF_SIGPENDING: \
83	___res = tsk->thread.work.sigpending; \
84	break; \
85	case TIF_NEED_RESCHED: \
86	___res = tsk->thread.work.need_resched; \
87	break; \
88	case TIF_SYSCALL_TRACE: \
89	___res = tsk->thread.work.syscall_trace;\
90	break; \
91	case TIF_MEMDIE: \
92	___res = tsk->thread.work.memdie;\
93	break; \
94	default: \
95	___res = thread_flag_fixme(); \
96	} \
97	___res; \
98	})
99
100	#define __get_set_tsk_thread_flag(tsk, flag, val) ({ \
101	int __res = __get_tsk_thread_flag(tsk, flag); \
102	__set_tsk_thread_flag(tsk, flag, val); \
103	__res; \
104	})
105		50
106	#define set_tsk_thread_flag(tsk, flag) __set_tsk_thread_flag(tsk, flag, ~0)	51	/* entry.S relies on these definitions!
107	#define clear_tsk_thread_flag(tsk, flag) __set_tsk_thread_flag(tsk, flag, 0)	52	* bits 0-7 are tested at every exception exit
108	#define test_and_set_tsk_thread_flag(tsk, flag) __get_set_tsk_thread_flag(tsk, flag, ~0)	53	* bits 8-15 are also tested at syscall exit
109	#define test_tsk_thread_flag(tsk, flag) __get_tsk_thread_flag(tsk, flag)	54	*/
110		55	#define TIF_SIGPENDING 6 /* signal pending */
111	#define set_thread_flag(flag) set_tsk_thread_flag(current, flag)	56	#define TIF_NEED_RESCHED 7 /* rescheduling necessary */
112	#define clear_thread_flag(flag) clear_tsk_thread_flag(current, flag)	57	#define TIF_DELAYED_TRACE 14 /* single step a syscall */
113	#define test_thread_flag(flag) test_tsk_thread_flag(current, flag)	58	#define TIF_SYSCALL_TRACE 15 /* syscall trace active */
114		59	#define TIF_MEMDIE 16
115	#define set_need_resched() set_thread_flag(TIF_NEED_RESCHED)
116	#define clear_need_resched() clear_thread_flag(TIF_NEED_RESCHED)
117		60
118	#endif /* _ASM_M68K_THREAD_INFO_H */	61	#endif /* _ASM_M68K_THREAD_INFO_H */