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