diff options
Diffstat (limited to 'arch/m68k/platform/68360/entry.S')
-rw-r--r-- | arch/m68k/platform/68360/entry.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/platform/68360/entry.S index 46c1b18c9dcb..a07b14feed92 100644 --- a/arch/m68k/platform/68360/entry.S +++ b/arch/m68k/platform/68360/entry.S | |||
@@ -12,7 +12,6 @@ | |||
12 | * M68360 Port by SED Systems, and Lineo. | 12 | * M68360 Port by SED Systems, and Lineo. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/sys.h> | ||
16 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
17 | #include <asm/thread_info.h> | 16 | #include <asm/thread_info.h> |
18 | #include <asm/unistd.h> | 17 | #include <asm/unistd.h> |
@@ -76,7 +75,7 @@ ENTRY(system_call) | |||
76 | movel %sp,%d1 /* get thread_info pointer */ | 75 | movel %sp,%d1 /* get thread_info pointer */ |
77 | andl #-THREAD_SIZE,%d1 | 76 | andl #-THREAD_SIZE,%d1 |
78 | movel %d1,%a2 | 77 | movel %d1,%a2 |
79 | btst #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8) | 78 | btst #(TIF_SYSCALL_TRACE%8),%a2@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8) |
80 | jne do_trace | 79 | jne do_trace |
81 | cmpl #NR_syscalls,%d0 | 80 | cmpl #NR_syscalls,%d0 |
82 | jcc badsys | 81 | jcc badsys |
@@ -103,12 +102,12 @@ Luser_return: | |||
103 | andl #-THREAD_SIZE,%d1 | 102 | andl #-THREAD_SIZE,%d1 |
104 | movel %d1,%a2 | 103 | movel %d1,%a2 |
105 | 1: | 104 | 1: |
106 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 105 | move %a2@(TINFO_FLAGS),%d1 /* thread_info->flags */ |
107 | jne Lwork_to_do | 106 | jne Lwork_to_do |
108 | RESTORE_ALL | 107 | RESTORE_ALL |
109 | 108 | ||
110 | Lwork_to_do: | 109 | Lwork_to_do: |
111 | movel %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 110 | movel %a2@(TINFO_FLAGS),%d1 /* thread_info->flags */ |
112 | btst #TIF_NEED_RESCHED,%d1 | 111 | btst #TIF_NEED_RESCHED,%d1 |
113 | jne reschedule | 112 | jne reschedule |
114 | 113 | ||