diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-03-29 01:55:36 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-05-24 01:17:18 -0400 |
commit | aa4d1f897f6a7ffdb3654a2152b60d9d832951a3 (patch) | |
tree | 39fb1190c24936a3e0fce96b0c0a4023e1bbbd53 | |
parent | a697dc934f52355494b746d7b5568227e0910ae8 (diff) |
m68k: merge mmu and non-mmu versions of asm-offsets.c
It is strait forward to merge the mmu and non-mmu versions of
asm-offstes.c. Some name changes are required for the preempt and
thread_info.flags in the non-mmu entry.S assembler to make them
consistent for both setups.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r-- | arch/m68k/kernel/asm-offsets.c | 106 | ||||
-rw-r--r-- | arch/m68k/kernel/asm-offsets_mm.c | 100 | ||||
-rw-r--r-- | arch/m68k/kernel/asm-offsets_no.c | 76 | ||||
-rw-r--r-- | arch/m68k/platform/68328/entry.S | 6 | ||||
-rw-r--r-- | arch/m68k/platform/68360/entry.S | 6 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/entry.S | 10 |
6 files changed, 114 insertions, 190 deletions
diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c index 59a69a5c62f2..983fed9d469b 100644 --- a/arch/m68k/kernel/asm-offsets.c +++ b/arch/m68k/kernel/asm-offsets.c | |||
@@ -1,5 +1,105 @@ | |||
1 | #ifdef CONFIG_MMU | 1 | /* |
2 | #include "asm-offsets_mm.c" | 2 | * This program is used to generate definitions needed by |
3 | * assembly language modules. | ||
4 | * | ||
5 | * We use the technique used in the OSF Mach kernel code: | ||
6 | * generate asm statements containing #defines, | ||
7 | * compile this file to assembler, and then extract the | ||
8 | * #defines from the assembly-language output. | ||
9 | */ | ||
10 | |||
11 | #define ASM_OFFSETS_C | ||
12 | |||
13 | #include <linux/stddef.h> | ||
14 | #include <linux/sched.h> | ||
15 | #include <linux/kernel_stat.h> | ||
16 | #include <linux/kbuild.h> | ||
17 | #include <asm/bootinfo.h> | ||
18 | #include <asm/irq.h> | ||
19 | #include <asm/amigahw.h> | ||
20 | #include <linux/font.h> | ||
21 | |||
22 | int main(void) | ||
23 | { | ||
24 | /* offsets into the task struct */ | ||
25 | DEFINE(TASK_THREAD, offsetof(struct task_struct, thread)); | ||
26 | DEFINE(TASK_MM, offsetof(struct task_struct, mm)); | ||
27 | DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info)); | ||
28 | DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info)); | ||
29 | |||
30 | /* offsets into the thread struct */ | ||
31 | DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp)); | ||
32 | DEFINE(THREAD_USP, offsetof(struct thread_struct, usp)); | ||
33 | DEFINE(THREAD_SR, offsetof(struct thread_struct, sr)); | ||
34 | DEFINE(THREAD_FS, offsetof(struct thread_struct, fs)); | ||
35 | DEFINE(THREAD_CRP, offsetof(struct thread_struct, crp)); | ||
36 | DEFINE(THREAD_ESP0, offsetof(struct thread_struct, esp0)); | ||
37 | DEFINE(THREAD_FPREG, offsetof(struct thread_struct, fp)); | ||
38 | DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl)); | ||
39 | DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate)); | ||
40 | |||
41 | /* offsets into the thread_info struct */ | ||
42 | DEFINE(TINFO_PREEMPT, offsetof(struct thread_info, preempt_count)); | ||
43 | DEFINE(TINFO_FLAGS, offsetof(struct thread_info, flags)); | ||
44 | |||
45 | /* offsets into the pt_regs */ | ||
46 | DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0)); | ||
47 | DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0)); | ||
48 | DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1)); | ||
49 | DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2)); | ||
50 | DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3)); | ||
51 | DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4)); | ||
52 | DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5)); | ||
53 | DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0)); | ||
54 | DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1)); | ||
55 | DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2)); | ||
56 | DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc)); | ||
57 | DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr)); | ||
58 | |||
59 | /* bitfields are a bit difficult */ | ||
60 | #ifdef CONFIG_COLDFIRE | ||
61 | DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, sr) - 2); | ||
3 | #else | 62 | #else |
4 | #include "asm-offsets_no.c" | 63 | DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4); |
64 | #endif | ||
65 | |||
66 | /* offsets into the irq_cpustat_t struct */ | ||
67 | DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending)); | ||
68 | |||
69 | /* signal defines */ | ||
70 | DEFINE(LSIGSEGV, SIGSEGV); | ||
71 | DEFINE(LSEGV_MAPERR, SEGV_MAPERR); | ||
72 | DEFINE(LSIGTRAP, SIGTRAP); | ||
73 | DEFINE(LTRAP_TRACE, TRAP_TRACE); | ||
74 | |||
75 | #ifdef CONFIG_MMU | ||
76 | /* offsets into the bi_record struct */ | ||
77 | DEFINE(BIR_TAG, offsetof(struct bi_record, tag)); | ||
78 | DEFINE(BIR_SIZE, offsetof(struct bi_record, size)); | ||
79 | DEFINE(BIR_DATA, offsetof(struct bi_record, data)); | ||
80 | |||
81 | /* offsets into font_desc (drivers/video/console/font.h) */ | ||
82 | DEFINE(FONT_DESC_IDX, offsetof(struct font_desc, idx)); | ||
83 | DEFINE(FONT_DESC_NAME, offsetof(struct font_desc, name)); | ||
84 | DEFINE(FONT_DESC_WIDTH, offsetof(struct font_desc, width)); | ||
85 | DEFINE(FONT_DESC_HEIGHT, offsetof(struct font_desc, height)); | ||
86 | DEFINE(FONT_DESC_DATA, offsetof(struct font_desc, data)); | ||
87 | DEFINE(FONT_DESC_PREF, offsetof(struct font_desc, pref)); | ||
88 | |||
89 | /* offsets into the custom struct */ | ||
90 | DEFINE(CUSTOMBASE, &amiga_custom); | ||
91 | DEFINE(C_INTENAR, offsetof(struct CUSTOM, intenar)); | ||
92 | DEFINE(C_INTREQR, offsetof(struct CUSTOM, intreqr)); | ||
93 | DEFINE(C_INTENA, offsetof(struct CUSTOM, intena)); | ||
94 | DEFINE(C_INTREQ, offsetof(struct CUSTOM, intreq)); | ||
95 | DEFINE(C_SERDATR, offsetof(struct CUSTOM, serdatr)); | ||
96 | DEFINE(C_SERDAT, offsetof(struct CUSTOM, serdat)); | ||
97 | DEFINE(C_SERPER, offsetof(struct CUSTOM, serper)); | ||
98 | DEFINE(CIAABASE, &ciaa); | ||
99 | DEFINE(CIABBASE, &ciab); | ||
100 | DEFINE(C_PRA, offsetof(struct CIA, pra)); | ||
101 | DEFINE(ZTWOBASE, zTwoBase); | ||
5 | #endif | 102 | #endif |
103 | |||
104 | return 0; | ||
105 | } | ||
diff --git a/arch/m68k/kernel/asm-offsets_mm.c b/arch/m68k/kernel/asm-offsets_mm.c deleted file mode 100644 index 78e59b82ebc3..000000000000 --- a/arch/m68k/kernel/asm-offsets_mm.c +++ /dev/null | |||
@@ -1,100 +0,0 @@ | |||
1 | /* | ||
2 | * This program is used to generate definitions needed by | ||
3 | * assembly language modules. | ||
4 | * | ||
5 | * We use the technique used in the OSF Mach kernel code: | ||
6 | * generate asm statements containing #defines, | ||
7 | * compile this file to assembler, and then extract the | ||
8 | * #defines from the assembly-language output. | ||
9 | */ | ||
10 | |||
11 | #define ASM_OFFSETS_C | ||
12 | |||
13 | #include <linux/stddef.h> | ||
14 | #include <linux/sched.h> | ||
15 | #include <linux/kernel_stat.h> | ||
16 | #include <linux/kbuild.h> | ||
17 | #include <asm/bootinfo.h> | ||
18 | #include <asm/irq.h> | ||
19 | #include <asm/amigahw.h> | ||
20 | #include <linux/font.h> | ||
21 | |||
22 | int main(void) | ||
23 | { | ||
24 | /* offsets into the task struct */ | ||
25 | DEFINE(TASK_THREAD, offsetof(struct task_struct, thread)); | ||
26 | DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info)); | ||
27 | DEFINE(TASK_MM, offsetof(struct task_struct, mm)); | ||
28 | #ifdef CONFIG_MMU | ||
29 | DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info)); | ||
30 | #endif | ||
31 | |||
32 | /* offsets into the thread struct */ | ||
33 | DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp)); | ||
34 | DEFINE(THREAD_USP, offsetof(struct thread_struct, usp)); | ||
35 | DEFINE(THREAD_SR, offsetof(struct thread_struct, sr)); | ||
36 | DEFINE(THREAD_FS, offsetof(struct thread_struct, fs)); | ||
37 | DEFINE(THREAD_CRP, offsetof(struct thread_struct, crp)); | ||
38 | DEFINE(THREAD_ESP0, offsetof(struct thread_struct, esp0)); | ||
39 | DEFINE(THREAD_FPREG, offsetof(struct thread_struct, fp)); | ||
40 | DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl)); | ||
41 | DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate)); | ||
42 | |||
43 | /* offsets into the thread_info struct */ | ||
44 | DEFINE(TINFO_PREEMPT, offsetof(struct thread_info, preempt_count)); | ||
45 | DEFINE(TINFO_FLAGS, offsetof(struct thread_info, flags)); | ||
46 | |||
47 | /* offsets into the pt_regs */ | ||
48 | DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0)); | ||
49 | DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0)); | ||
50 | DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1)); | ||
51 | DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2)); | ||
52 | DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3)); | ||
53 | DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4)); | ||
54 | DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5)); | ||
55 | DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0)); | ||
56 | DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1)); | ||
57 | DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2)); | ||
58 | DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc)); | ||
59 | DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr)); | ||
60 | /* bitfields are a bit difficult */ | ||
61 | DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4); | ||
62 | |||
63 | /* offsets into the irq_cpustat_t struct */ | ||
64 | DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending)); | ||
65 | |||
66 | /* offsets into the bi_record struct */ | ||
67 | DEFINE(BIR_TAG, offsetof(struct bi_record, tag)); | ||
68 | DEFINE(BIR_SIZE, offsetof(struct bi_record, size)); | ||
69 | DEFINE(BIR_DATA, offsetof(struct bi_record, data)); | ||
70 | |||
71 | /* offsets into font_desc (drivers/video/console/font.h) */ | ||
72 | DEFINE(FONT_DESC_IDX, offsetof(struct font_desc, idx)); | ||
73 | DEFINE(FONT_DESC_NAME, offsetof(struct font_desc, name)); | ||
74 | DEFINE(FONT_DESC_WIDTH, offsetof(struct font_desc, width)); | ||
75 | DEFINE(FONT_DESC_HEIGHT, offsetof(struct font_desc, height)); | ||
76 | DEFINE(FONT_DESC_DATA, offsetof(struct font_desc, data)); | ||
77 | DEFINE(FONT_DESC_PREF, offsetof(struct font_desc, pref)); | ||
78 | |||
79 | /* signal defines */ | ||
80 | DEFINE(LSIGSEGV, SIGSEGV); | ||
81 | DEFINE(LSEGV_MAPERR, SEGV_MAPERR); | ||
82 | DEFINE(LSIGTRAP, SIGTRAP); | ||
83 | DEFINE(LTRAP_TRACE, TRAP_TRACE); | ||
84 | |||
85 | /* offsets into the custom struct */ | ||
86 | DEFINE(CUSTOMBASE, &amiga_custom); | ||
87 | DEFINE(C_INTENAR, offsetof(struct CUSTOM, intenar)); | ||
88 | DEFINE(C_INTREQR, offsetof(struct CUSTOM, intreqr)); | ||
89 | DEFINE(C_INTENA, offsetof(struct CUSTOM, intena)); | ||
90 | DEFINE(C_INTREQ, offsetof(struct CUSTOM, intreq)); | ||
91 | DEFINE(C_SERDATR, offsetof(struct CUSTOM, serdatr)); | ||
92 | DEFINE(C_SERDAT, offsetof(struct CUSTOM, serdat)); | ||
93 | DEFINE(C_SERPER, offsetof(struct CUSTOM, serper)); | ||
94 | DEFINE(CIAABASE, &ciaa); | ||
95 | DEFINE(CIABBASE, &ciab); | ||
96 | DEFINE(C_PRA, offsetof(struct CIA, pra)); | ||
97 | DEFINE(ZTWOBASE, zTwoBase); | ||
98 | |||
99 | return 0; | ||
100 | } | ||
diff --git a/arch/m68k/kernel/asm-offsets_no.c b/arch/m68k/kernel/asm-offsets_no.c deleted file mode 100644 index ffe02f41ad46..000000000000 --- a/arch/m68k/kernel/asm-offsets_no.c +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | /* | ||
2 | * This program is used to generate definitions needed by | ||
3 | * assembly language modules. | ||
4 | * | ||
5 | * We use the technique used in the OSF Mach kernel code: | ||
6 | * generate asm statements containing #defines, | ||
7 | * compile this file to assembler, and then extract the | ||
8 | * #defines from the assembly-language output. | ||
9 | */ | ||
10 | |||
11 | #include <linux/stddef.h> | ||
12 | #include <linux/sched.h> | ||
13 | #include <linux/kernel_stat.h> | ||
14 | #include <linux/ptrace.h> | ||
15 | #include <linux/hardirq.h> | ||
16 | #include <linux/kbuild.h> | ||
17 | #include <asm/bootinfo.h> | ||
18 | #include <asm/irq.h> | ||
19 | #include <asm/thread_info.h> | ||
20 | |||
21 | int main(void) | ||
22 | { | ||
23 | /* offsets into the task struct */ | ||
24 | DEFINE(TASK_THREAD, offsetof(struct task_struct, thread)); | ||
25 | DEFINE(TASK_MM, offsetof(struct task_struct, mm)); | ||
26 | |||
27 | /* offsets into the irq_cpustat_t struct */ | ||
28 | DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending)); | ||
29 | |||
30 | /* offsets into the thread struct */ | ||
31 | DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp)); | ||
32 | DEFINE(THREAD_USP, offsetof(struct thread_struct, usp)); | ||
33 | DEFINE(THREAD_SR, offsetof(struct thread_struct, sr)); | ||
34 | DEFINE(THREAD_FS, offsetof(struct thread_struct, fs)); | ||
35 | DEFINE(THREAD_CRP, offsetof(struct thread_struct, crp)); | ||
36 | DEFINE(THREAD_ESP0, offsetof(struct thread_struct, esp0)); | ||
37 | DEFINE(THREAD_FPREG, offsetof(struct thread_struct, fp)); | ||
38 | DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl)); | ||
39 | DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate)); | ||
40 | |||
41 | /* offsets into the pt_regs */ | ||
42 | DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0)); | ||
43 | DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0)); | ||
44 | DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1)); | ||
45 | DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2)); | ||
46 | DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3)); | ||
47 | DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4)); | ||
48 | DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5)); | ||
49 | DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0)); | ||
50 | DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1)); | ||
51 | DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2)); | ||
52 | DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc)); | ||
53 | DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr)); | ||
54 | |||
55 | #ifdef CONFIG_COLDFIRE | ||
56 | /* bitfields are a bit difficult */ | ||
57 | DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, sr) - 2); | ||
58 | #else | ||
59 | /* bitfields are a bit difficult */ | ||
60 | DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4); | ||
61 | #endif | ||
62 | |||
63 | /* signal defines */ | ||
64 | DEFINE(SIGSEGV, SIGSEGV); | ||
65 | DEFINE(SEGV_MAPERR, SEGV_MAPERR); | ||
66 | DEFINE(SIGTRAP, SIGTRAP); | ||
67 | DEFINE(TRAP_TRACE, TRAP_TRACE); | ||
68 | |||
69 | DEFINE(PT_PTRACED, PT_PTRACED); | ||
70 | |||
71 | /* Offsets in thread_info structure */ | ||
72 | DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); | ||
73 | DEFINE(TI_PREEMPTCOUNT, offsetof(struct thread_info, preempt_count)); | ||
74 | |||
75 | return 0; | ||
76 | } | ||
diff --git a/arch/m68k/platform/68328/entry.S b/arch/m68k/platform/68328/entry.S index 676960cf022a..3e4675996a71 100644 --- a/arch/m68k/platform/68328/entry.S +++ b/arch/m68k/platform/68328/entry.S | |||
@@ -80,7 +80,7 @@ ENTRY(system_call) | |||
80 | movel %sp,%d1 /* get thread_info pointer */ | 80 | movel %sp,%d1 /* get thread_info pointer */ |
81 | andl #-THREAD_SIZE,%d1 | 81 | andl #-THREAD_SIZE,%d1 |
82 | movel %d1,%a2 | 82 | movel %d1,%a2 |
83 | btst #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8) | 83 | btst #(TIF_SYSCALL_TRACE%8),%a2@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8) |
84 | jne do_trace | 84 | jne do_trace |
85 | cmpl #NR_syscalls,%d0 | 85 | cmpl #NR_syscalls,%d0 |
86 | jcc badsys | 86 | jcc badsys |
@@ -107,12 +107,12 @@ Luser_return: | |||
107 | andl #-THREAD_SIZE,%d1 | 107 | andl #-THREAD_SIZE,%d1 |
108 | movel %d1,%a2 | 108 | movel %d1,%a2 |
109 | 1: | 109 | 1: |
110 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 110 | move %a2@(TINFO_FLAGS),%d1 /* thread_info->flags */ |
111 | jne Lwork_to_do | 111 | jne Lwork_to_do |
112 | RESTORE_ALL | 112 | RESTORE_ALL |
113 | 113 | ||
114 | Lwork_to_do: | 114 | Lwork_to_do: |
115 | movel %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 115 | movel %a2@(TINFO_FLAGS),%d1 /* thread_info->flags */ |
116 | btst #TIF_NEED_RESCHED,%d1 | 116 | btst #TIF_NEED_RESCHED,%d1 |
117 | jne reschedule | 117 | jne reschedule |
118 | 118 | ||
diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/platform/68360/entry.S index 46c1b18c9dcb..50dcae66f6cd 100644 --- a/arch/m68k/platform/68360/entry.S +++ b/arch/m68k/platform/68360/entry.S | |||
@@ -76,7 +76,7 @@ ENTRY(system_call) | |||
76 | movel %sp,%d1 /* get thread_info pointer */ | 76 | movel %sp,%d1 /* get thread_info pointer */ |
77 | andl #-THREAD_SIZE,%d1 | 77 | andl #-THREAD_SIZE,%d1 |
78 | movel %d1,%a2 | 78 | movel %d1,%a2 |
79 | btst #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8) | 79 | btst #(TIF_SYSCALL_TRACE%8),%a2@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8) |
80 | jne do_trace | 80 | jne do_trace |
81 | cmpl #NR_syscalls,%d0 | 81 | cmpl #NR_syscalls,%d0 |
82 | jcc badsys | 82 | jcc badsys |
@@ -103,12 +103,12 @@ Luser_return: | |||
103 | andl #-THREAD_SIZE,%d1 | 103 | andl #-THREAD_SIZE,%d1 |
104 | movel %d1,%a2 | 104 | movel %d1,%a2 |
105 | 1: | 105 | 1: |
106 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 106 | move %a2@(TINFO_FLAGS),%d1 /* thread_info->flags */ |
107 | jne Lwork_to_do | 107 | jne Lwork_to_do |
108 | RESTORE_ALL | 108 | RESTORE_ALL |
109 | 109 | ||
110 | Lwork_to_do: | 110 | Lwork_to_do: |
111 | movel %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 111 | movel %a2@(TINFO_FLAGS),%d1 /* thread_info->flags */ |
112 | btst #TIF_NEED_RESCHED,%d1 | 112 | btst #TIF_NEED_RESCHED,%d1 |
113 | jne reschedule | 113 | jne reschedule |
114 | 114 | ||
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S index eab63f09965b..eee9a06aa265 100644 --- a/arch/m68k/platform/coldfire/entry.S +++ b/arch/m68k/platform/coldfire/entry.S | |||
@@ -78,7 +78,7 @@ ENTRY(system_call) | |||
78 | movel %d2,%a0 | 78 | movel %d2,%a0 |
79 | movel %a0@,%a1 /* save top of frame */ | 79 | movel %a0@,%a1 /* save top of frame */ |
80 | movel %sp,%a1@(TASK_THREAD+THREAD_ESP0) | 80 | movel %sp,%a1@(TASK_THREAD+THREAD_ESP0) |
81 | btst #(TIF_SYSCALL_TRACE%8),%a0@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8) | 81 | btst #(TIF_SYSCALL_TRACE%8),%a0@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8) |
82 | bnes 1f | 82 | bnes 1f |
83 | 83 | ||
84 | movel %d3,%a0 | 84 | movel %d3,%a0 |
@@ -113,11 +113,11 @@ ret_from_exception: | |||
113 | movel %sp,%d1 /* get thread_info pointer */ | 113 | movel %sp,%d1 /* get thread_info pointer */ |
114 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ | 114 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ |
115 | movel %d1,%a0 | 115 | movel %d1,%a0 |
116 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 116 | movel %a0@(TINFO_FLAGS),%d1 /* get thread_info->flags */ |
117 | andl #(1<<TIF_NEED_RESCHED),%d1 | 117 | andl #(1<<TIF_NEED_RESCHED),%d1 |
118 | jeq Lkernel_return | 118 | jeq Lkernel_return |
119 | 119 | ||
120 | movel %a0@(TI_PREEMPTCOUNT),%d1 | 120 | movel %a0@(TINFO_PREEMPT),%d1 |
121 | cmpl #0,%d1 | 121 | cmpl #0,%d1 |
122 | jne Lkernel_return | 122 | jne Lkernel_return |
123 | 123 | ||
@@ -137,14 +137,14 @@ Luser_return: | |||
137 | movel %sp,%d1 /* get thread_info pointer */ | 137 | movel %sp,%d1 /* get thread_info pointer */ |
138 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ | 138 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ |
139 | movel %d1,%a0 | 139 | movel %d1,%a0 |
140 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 140 | movel %a0@(TINFO_FLAGS),%d1 /* get thread_info->flags */ |
141 | jne Lwork_to_do /* still work to do */ | 141 | jne Lwork_to_do /* still work to do */ |
142 | 142 | ||
143 | Lreturn: | 143 | Lreturn: |
144 | RESTORE_USER | 144 | RESTORE_USER |
145 | 145 | ||
146 | Lwork_to_do: | 146 | Lwork_to_do: |
147 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 147 | movel %a0@(TINFO_FLAGS),%d1 /* get thread_info->flags */ |
148 | move #0x2000,%sr /* enable intrs again */ | 148 | move #0x2000,%sr /* enable intrs again */ |
149 | btst #TIF_NEED_RESCHED,%d1 | 149 | btst #TIF_NEED_RESCHED,%d1 |
150 | jne reschedule | 150 | jne reschedule |