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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
m68k
/
platform
/
68360
/
entry.S
diff --git
a/arch/m68k/platform/68360/entry.S
b/arch/m68k/platform/68360/entry.S
index
46c1b18
..
a07b14f
100644
(file)
--- a/
arch/m68k/platform/68360/entry.S
+++ b/
arch/m68k/platform/68360/entry.S
@@
-12,7
+12,6
@@
* M68360 Port by SED Systems, and Lineo.
*/
* M68360 Port by SED Systems, and Lineo.
*/
-#include <linux/sys.h>
#include <linux/linkage.h>
#include <asm/thread_info.h>
#include <asm/unistd.h>
#include <linux/linkage.h>
#include <asm/thread_info.h>
#include <asm/unistd.h>
@@
-76,7
+75,7
@@
ENTRY(system_call)
movel %sp,%d1 /* get thread_info pointer */
andl #-THREAD_SIZE,%d1
movel %d1,%a2
movel %sp,%d1 /* get thread_info pointer */
andl #-THREAD_SIZE,%d1
movel %d1,%a2
- btst #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
+ btst #(TIF_SYSCALL_TRACE%8),%a2@(TI
NFO
_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
jne do_trace
cmpl #NR_syscalls,%d0
jcc badsys
jne do_trace
cmpl #NR_syscalls,%d0
jcc badsys
@@
-103,12
+102,12
@@
Luser_return:
andl #-THREAD_SIZE,%d1
movel %d1,%a2
1:
andl #-THREAD_SIZE,%d1
movel %d1,%a2
1:
- move %a2@(TI
_FLAGS),%d1
/* thread_info->flags */
+ move %a2@(TI
NFO_FLAGS),%d1
/* thread_info->flags */
jne Lwork_to_do
RESTORE_ALL
Lwork_to_do:
jne Lwork_to_do
RESTORE_ALL
Lwork_to_do:
- movel %a2@(TI
_FLAGS),%d1
/* thread_info->flags */
+ movel %a2@(TI
NFO_FLAGS),%d1
/* thread_info->flags */
btst #TIF_NEED_RESCHED,%d1
jne reschedule
btst #TIF_NEED_RESCHED,%d1
jne reschedule