diff options
-rw-r--r-- | arch/m68knommu/platform/coldfire/entry.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S index 1af7c1d650f6..1e3c0dcbd7ac 100644 --- a/arch/m68knommu/platform/coldfire/entry.S +++ b/arch/m68knommu/platform/coldfire/entry.S | |||
@@ -103,6 +103,7 @@ ret_from_signal: | |||
103 | addql #4,%sp | 103 | addql #4,%sp |
104 | 104 | ||
105 | ret_from_exception: | 105 | ret_from_exception: |
106 | move #0x2700,%sr /* disable intrs */ | ||
106 | btst #5,%sp@(PT_SR) /* check if returning to kernel */ | 107 | btst #5,%sp@(PT_SR) /* check if returning to kernel */ |
107 | jeq Luser_return /* if so, skip resched, signals */ | 108 | jeq Luser_return /* if so, skip resched, signals */ |
108 | 109 | ||
@@ -156,6 +157,7 @@ Lreturn: | |||
156 | 157 | ||
157 | Lwork_to_do: | 158 | Lwork_to_do: |
158 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 159 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ |
160 | move #0x2000,%sr /* enable intrs again */ | ||
159 | btst #TIF_NEED_RESCHED,%d1 | 161 | btst #TIF_NEED_RESCHED,%d1 |
160 | jne reschedule | 162 | jne reschedule |
161 | 163 | ||