git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[pandora-kernel.git]
/
arch
/
m68knommu
/
platform
/
coldfire
/
entry.S
diff --git
a/arch/m68knommu/platform/coldfire/entry.S
b/arch/m68knommu/platform/coldfire/entry.S
index
dd7d591
..
5e92bed
100644
(file)
--- a/
arch/m68knommu/platform/coldfire/entry.S
+++ b/
arch/m68knommu/platform/coldfire/entry.S
@@
-88,7
+88,7
@@
ENTRY(system_call)
movel %d2,PT_OFF_D0(%sp) /* on syscall entry */
subql #4,%sp
SAVE_SWITCH_STACK
movel %d2,PT_OFF_D0(%sp) /* on syscall entry */
subql #4,%sp
SAVE_SWITCH_STACK
- jbsr syscall_trace
+ jbsr syscall_trace
_enter
RESTORE_SWITCH_STACK
addql #4,%sp
movel %d3,%a0
RESTORE_SWITCH_STACK
addql #4,%sp
movel %d3,%a0
@@
-96,7
+96,7
@@
ENTRY(system_call)
movel %d0,%sp@(PT_OFF_D0) /* save the return value */
subql #4,%sp /* dummy return address */
SAVE_SWITCH_STACK
movel %d0,%sp@(PT_OFF_D0) /* save the return value */
subql #4,%sp /* dummy return address */
SAVE_SWITCH_STACK
- jbsr syscall_trace
+ jbsr syscall_trace
_leave
ret_from_signal:
RESTORE_SWITCH_STACK
ret_from_signal:
RESTORE_SWITCH_STACK
@@
-112,7
+112,7
@@
ret_from_exception:
andl #-THREAD_SIZE,%d1 /* at base of kernel stack */
movel %d1,%a0
movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */
andl #-THREAD_SIZE,%d1 /* at base of kernel stack */
movel %d1,%a0
movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */
- andl #
_TIF_NEED_RESCHED
,%d1
+ andl #
(1<<TIF_NEED_RESCHED)
,%d1
jeq Lkernel_return
movel %a0@(TI_PREEMPTCOUNT),%d1
jeq Lkernel_return
movel %a0@(TI_PREEMPTCOUNT),%d1
@@
-136,7
+136,7
@@
Luser_return:
andl #-THREAD_SIZE,%d1 /* at base of kernel stack */
movel %d1,%a0
movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */
andl #-THREAD_SIZE,%d1 /* at base of kernel stack */
movel %d1,%a0
movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */
- andl #
_TIF_WORK_MASK
,%d1
+ andl #
0xefff
,%d1
jne Lwork_to_do /* still work to do */
Lreturn:
jne Lwork_to_do /* still work to do */
Lreturn: