Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'm68knommu-for-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer:
- fix task info flags handling for 68000 nommu
* tag 'm68knommu-for-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: Fix task info flags handling for 68000
+13
-8
+13
-8
arch/m68k/68000/entry.S
+13
-8
arch/m68k/68000/entry.S
···
18
18
19
19
.text
20
20
21
+
/* get thread_info pointer into a2 */
22
+
.macro getthreadinfo
23
+
movel %sp,%d1
24
+
andl #-THREAD_SIZE,%d1
25
+
movel %d1,%a2
26
+
.endm
27
+
21
28
.globl system_call
22
29
.globl resume
23
30
.globl ret_from_exception
···
77
70
78
71
movel %sp@(PT_OFF_ORIG_D0),%d0
79
72
80
-
movel %sp,%d1 /* get thread_info pointer */
81
-
andl #-THREAD_SIZE,%d1
82
-
movel %d1,%a2
73
+
/* Doing a trace ? */
74
+
getthreadinfo
83
75
btst #(TIF_SYSCALL_TRACE%8),%a2@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
84
76
jne do_trace
85
77
cmpl #NR_syscalls,%d0
···
102
96
/* heavy interrupt load*/
103
97
andw #ALLOWINT,%sr
104
98
105
-
movel %sp,%d1 /* get thread_info pointer */
106
-
andl #-THREAD_SIZE,%d1
107
-
movel %d1,%a2
99
+
getthreadinfo
108
100
1:
109
-
move %a2@(TINFO_FLAGS),%d1 /* thread_info->flags */
101
+
/* check if any of the flags are set */
102
+
moveb %a2@(TINFO_FLAGS + 3),%d1 /* thread_info->flags (low 8 bits) */
110
103
jne Lwork_to_do
111
104
RESTORE_ALL
112
105
113
106
Lwork_to_do:
114
-
movel %a2@(TINFO_FLAGS),%d1 /* thread_info->flags */
107
+
/* check if reschedule needs to be called */
115
108
btst #TIF_NEED_RESCHED,%d1
116
109
jne reschedule
117
110