diff options
Diffstat (limited to 'arch/m68k/platform/coldfire/entry.S')
| -rw-r--r-- | arch/m68k/platform/coldfire/entry.S | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S index eab63f09965b..27c2b001161e 100644 --- a/arch/m68k/platform/coldfire/entry.S +++ b/arch/m68k/platform/coldfire/entry.S | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Bug, speed and maintainability fixes by Philippe De Muyter <phdm@macqel.be> | 26 | * Bug, speed and maintainability fixes by Philippe De Muyter <phdm@macqel.be> |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/sys.h> | ||
| 30 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
| 31 | #include <asm/unistd.h> | 30 | #include <asm/unistd.h> |
| 32 | #include <asm/thread_info.h> | 31 | #include <asm/thread_info.h> |
| @@ -78,7 +77,7 @@ ENTRY(system_call) | |||
| 78 | movel %d2,%a0 | 77 | movel %d2,%a0 |
| 79 | movel %a0@,%a1 /* save top of frame */ | 78 | movel %a0@,%a1 /* save top of frame */ |
| 80 | movel %sp,%a1@(TASK_THREAD+THREAD_ESP0) | 79 | movel %sp,%a1@(TASK_THREAD+THREAD_ESP0) |
| 81 | btst #(TIF_SYSCALL_TRACE%8),%a0@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8) | 80 | btst #(TIF_SYSCALL_TRACE%8),%a0@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8) |
| 82 | bnes 1f | 81 | bnes 1f |
| 83 | 82 | ||
| 84 | movel %d3,%a0 | 83 | movel %d3,%a0 |
| @@ -113,11 +112,11 @@ ret_from_exception: | |||
| 113 | movel %sp,%d1 /* get thread_info pointer */ | 112 | movel %sp,%d1 /* get thread_info pointer */ |
| 114 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ | 113 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ |
| 115 | movel %d1,%a0 | 114 | movel %d1,%a0 |
| 116 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 115 | movel %a0@(TINFO_FLAGS),%d1 /* get thread_info->flags */ |
| 117 | andl #(1<<TIF_NEED_RESCHED),%d1 | 116 | andl #(1<<TIF_NEED_RESCHED),%d1 |
| 118 | jeq Lkernel_return | 117 | jeq Lkernel_return |
| 119 | 118 | ||
| 120 | movel %a0@(TI_PREEMPTCOUNT),%d1 | 119 | movel %a0@(TINFO_PREEMPT),%d1 |
| 121 | cmpl #0,%d1 | 120 | cmpl #0,%d1 |
| 122 | jne Lkernel_return | 121 | jne Lkernel_return |
| 123 | 122 | ||
| @@ -137,14 +136,14 @@ Luser_return: | |||
| 137 | movel %sp,%d1 /* get thread_info pointer */ | 136 | movel %sp,%d1 /* get thread_info pointer */ |
| 138 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ | 137 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ |
| 139 | movel %d1,%a0 | 138 | movel %d1,%a0 |
| 140 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 139 | movel %a0@(TINFO_FLAGS),%d1 /* get thread_info->flags */ |
| 141 | jne Lwork_to_do /* still work to do */ | 140 | jne Lwork_to_do /* still work to do */ |
| 142 | 141 | ||
| 143 | Lreturn: | 142 | Lreturn: |
| 144 | RESTORE_USER | 143 | RESTORE_USER |
| 145 | 144 | ||
| 146 | Lwork_to_do: | 145 | Lwork_to_do: |
| 147 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 146 | movel %a0@(TINFO_FLAGS),%d1 /* get thread_info->flags */ |
| 148 | move #0x2000,%sr /* enable intrs again */ | 147 | move #0x2000,%sr /* enable intrs again */ |
| 149 | btst #TIF_NEED_RESCHED,%d1 | 148 | btst #TIF_NEED_RESCHED,%d1 |
| 150 | jne reschedule | 149 | jne reschedule |