diff options
author | Greg Ungerer <gerg@uclinux.org> | 2012-01-16 01:46:04 -0500 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2012-02-06 20:03:53 -0500 |
commit | 8b3262c00d6feccdccd6567d27687ae4b64c54bd (patch) | |
tree | a9f0f6aaa948722b6bb5aa121a550e5e6d6bd0b3 /arch/m68k | |
parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) |
m68knommu: fix syscall tracing stuck process
The return path from an exception was checking too many bits in the
thread_info->flags, and getting stuck calling do_signal(). There was
no work to do, we should only be checking the low 8 bits (as per comments
and definitions in arch/m68k/include/asm/thread_info.h).
This fixes the stuck process problem when using strace.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/platform/coldfire/entry.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S index 863889fc31c9..281e38c2b6c7 100644 --- a/arch/m68k/platform/coldfire/entry.S +++ b/arch/m68k/platform/coldfire/entry.S | |||
@@ -136,7 +136,7 @@ Luser_return: | |||
136 | movel %sp,%d1 /* get thread_info pointer */ | 136 | movel %sp,%d1 /* get thread_info pointer */ |
137 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ | 137 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ |
138 | movel %d1,%a0 | 138 | movel %d1,%a0 |
139 | movel %a0@(TINFO_FLAGS),%d1 /* get thread_info->flags */ | 139 | moveb %a0@(TINFO_FLAGS+3),%d1 /* thread_info->flags (low 8 bits) */ |
140 | jne Lwork_to_do /* still work to do */ | 140 | jne Lwork_to_do /* still work to do */ |
141 | 141 | ||
142 | Lreturn: | 142 | Lreturn: |
@@ -148,8 +148,6 @@ Lwork_to_do: | |||
148 | btst #TIF_NEED_RESCHED,%d1 | 148 | btst #TIF_NEED_RESCHED,%d1 |
149 | jne reschedule | 149 | jne reschedule |
150 | 150 | ||
151 | /* GERG: do we need something here for TRACEing?? */ | ||
152 | |||
153 | Lsignal_return: | 151 | Lsignal_return: |
154 | subql #4,%sp /* dummy return address */ | 152 | subql #4,%sp /* dummy return address */ |
155 | SAVE_SWITCH_STACK | 153 | SAVE_SWITCH_STACK |