tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

m68knommu: fix rename of pt_regs offset defines breakage

Commit f159ee782990aacb5494738c98f13a2aa61dbb4a ("locking,
m68k/asm-offsets: Rename pt_regs offset defines") breaks the
m68knommu entry code that relies on these define names.
Fix the files to match the new define names.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

Greg Ungerer c84b564e 63335138

+51 -51
+14 -14
arch/m68knommu/kernel/asm-offsets.c
··· 45 45 DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate)); 46 46 47 47 /* offsets into the pt_regs */ 48 - DEFINE(PT_D0, offsetof(struct pt_regs, d0)); 49 - DEFINE(PT_ORIG_D0, offsetof(struct pt_regs, orig_d0)); 50 - DEFINE(PT_D1, offsetof(struct pt_regs, d1)); 51 - DEFINE(PT_D2, offsetof(struct pt_regs, d2)); 52 - DEFINE(PT_D3, offsetof(struct pt_regs, d3)); 53 - DEFINE(PT_D4, offsetof(struct pt_regs, d4)); 54 - DEFINE(PT_D5, offsetof(struct pt_regs, d5)); 55 - DEFINE(PT_A0, offsetof(struct pt_regs, a0)); 56 - DEFINE(PT_A1, offsetof(struct pt_regs, a1)); 57 - DEFINE(PT_A2, offsetof(struct pt_regs, a2)); 58 - DEFINE(PT_PC, offsetof(struct pt_regs, pc)); 59 - DEFINE(PT_SR, offsetof(struct pt_regs, sr)); 48 + DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0)); 49 + DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0)); 50 + DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1)); 51 + DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2)); 52 + DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3)); 53 + DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4)); 54 + DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5)); 55 + DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0)); 56 + DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1)); 57 + DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2)); 58 + DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc)); 59 + DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr)); 60 60 61 61 #ifdef CONFIG_COLDFIRE 62 62 /* bitfields are a bit difficult */ 63 - DEFINE(PT_FORMATVEC, offsetof(struct pt_regs, sr) - 2); 63 + DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, sr) - 2); 64 64 #else 65 65 /* bitfields are a bit difficult */ 66 - DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) + 4); 66 + DEFINE(PT_OFF_VECTOR, offsetof(struct pt_regs, pc) + 4); 67 67 #endif 68 68 69 69 /* signal defines */
+3 -3
arch/m68knommu/kernel/entry.S
··· 46 46 ENTRY(buserr) 47 47 SAVE_ALL 48 48 moveq #-1,%d0 49 - movel %d0,%sp@(PT_ORIG_D0) 49 + movel %d0,%sp@(PT_OFF_ORIG_D0) 50 50 movel %sp,%sp@- /* stack frame pointer argument */ 51 51 jsr buserr_c 52 52 addql #4,%sp ··· 55 55 ENTRY(trap) 56 56 SAVE_ALL 57 57 moveq #-1,%d0 58 - movel %d0,%sp@(PT_ORIG_D0) 58 + movel %d0,%sp@(PT_OFF_ORIG_D0) 59 59 movel %sp,%sp@- /* stack frame pointer argument */ 60 60 jsr trap_c 61 61 addql #4,%sp ··· 67 67 ENTRY(dbginterrupt) 68 68 SAVE_ALL 69 69 moveq #-1,%d0 70 - movel %d0,%sp@(PT_ORIG_D0) 70 + movel %d0,%sp@(PT_OFF_ORIG_D0) 71 71 movel %sp,%sp@- /* stack frame pointer argument */ 72 72 jsr dbginterrupt_c 73 73 addql #4,%sp
+16 -16
arch/m68knommu/platform/68328/entry.S
··· 39 39 .globl inthandler7 40 40 41 41 badsys: 42 - movel #-ENOSYS,%sp@(PT_D0) 42 + movel #-ENOSYS,%sp@(PT_OFF_D0) 43 43 jra ret_from_exception 44 44 45 45 do_trace: 46 - movel #-ENOSYS,%sp@(PT_D0) /* needed for strace*/ 46 + movel #-ENOSYS,%sp@(PT_OFF_D0) /* needed for strace*/ 47 47 subql #4,%sp 48 48 SAVE_SWITCH_STACK 49 49 jbsr syscall_trace 50 50 RESTORE_SWITCH_STACK 51 51 addql #4,%sp 52 - movel %sp@(PT_ORIG_D0),%d1 52 + movel %sp@(PT_OFF_ORIG_D0),%d1 53 53 movel #-ENOSYS,%d0 54 54 cmpl #NR_syscalls,%d1 55 55 jcc 1f ··· 57 57 lea sys_call_table, %a0 58 58 jbsr %a0@(%d1) 59 59 60 - 1: movel %d0,%sp@(PT_D0) /* save the return value */ 60 + 1: movel %d0,%sp@(PT_OFF_D0) /* save the return value */ 61 61 subql #4,%sp /* dummy return address */ 62 62 SAVE_SWITCH_STACK 63 63 jbsr syscall_trace ··· 75 75 jbsr set_esp0 76 76 addql #4,%sp 77 77 78 - movel %sp@(PT_ORIG_D0),%d0 78 + movel %sp@(PT_OFF_ORIG_D0),%d0 79 79 80 80 movel %sp,%d1 /* get thread_info pointer */ 81 81 andl #-THREAD_SIZE,%d1 ··· 88 88 lea sys_call_table,%a0 89 89 movel %a0@(%d0), %a0 90 90 jbsr %a0@ 91 - movel %d0,%sp@(PT_D0) /* save the return value*/ 91 + movel %d0,%sp@(PT_OFF_D0) /* save the return value*/ 92 92 93 93 ret_from_exception: 94 - btst #5,%sp@(PT_SR) /* check if returning to kernel*/ 94 + btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel*/ 95 95 jeq Luser_return /* if so, skip resched, signals*/ 96 96 97 97 Lkernel_return: ··· 133 133 */ 134 134 inthandler1: 135 135 SAVE_ALL 136 - movew %sp@(PT_VECTOR), %d0 136 + movew %sp@(PT_OFF_VECTOR), %d0 137 137 and #0x3ff, %d0 138 138 139 139 movel %sp,%sp@- ··· 144 144 145 145 inthandler2: 146 146 SAVE_ALL 147 - movew %sp@(PT_VECTOR), %d0 147 + movew %sp@(PT_OFF_VECTOR), %d0 148 148 and #0x3ff, %d0 149 149 150 150 movel %sp,%sp@- ··· 155 155 156 156 inthandler3: 157 157 SAVE_ALL 158 - movew %sp@(PT_VECTOR), %d0 158 + movew %sp@(PT_OFF_VECTOR), %d0 159 159 and #0x3ff, %d0 160 160 161 161 movel %sp,%sp@- ··· 166 166 167 167 inthandler4: 168 168 SAVE_ALL 169 - movew %sp@(PT_VECTOR), %d0 169 + movew %sp@(PT_OFF_VECTOR), %d0 170 170 and #0x3ff, %d0 171 171 172 172 movel %sp,%sp@- ··· 177 177 178 178 inthandler5: 179 179 SAVE_ALL 180 - movew %sp@(PT_VECTOR), %d0 180 + movew %sp@(PT_OFF_VECTOR), %d0 181 181 and #0x3ff, %d0 182 182 183 183 movel %sp,%sp@- ··· 188 188 189 189 inthandler6: 190 190 SAVE_ALL 191 - movew %sp@(PT_VECTOR), %d0 191 + movew %sp@(PT_OFF_VECTOR), %d0 192 192 and #0x3ff, %d0 193 193 194 194 movel %sp,%sp@- ··· 199 199 200 200 inthandler7: 201 201 SAVE_ALL 202 - movew %sp@(PT_VECTOR), %d0 202 + movew %sp@(PT_OFF_VECTOR), %d0 203 203 and #0x3ff, %d0 204 204 205 205 movel %sp,%sp@- ··· 210 210 211 211 inthandler: 212 212 SAVE_ALL 213 - movew %sp@(PT_VECTOR), %d0 213 + movew %sp@(PT_OFF_VECTOR), %d0 214 214 and #0x3ff, %d0 215 215 216 216 movel %sp,%sp@- ··· 224 224 2: 225 225 RESTORE_ALL 226 226 1: 227 - moveb %sp@(PT_SR), %d0 227 + moveb %sp@(PT_OFF_SR), %d0 228 228 and #7, %d0 229 229 jhi 2b 230 230
+8 -8
arch/m68knommu/platform/68360/entry.S
··· 35 35 .globl inthandler 36 36 37 37 badsys: 38 - movel #-ENOSYS,%sp@(PT_D0) 38 + movel #-ENOSYS,%sp@(PT_OFF_D0) 39 39 jra ret_from_exception 40 40 41 41 do_trace: 42 - movel #-ENOSYS,%sp@(PT_D0) /* needed for strace*/ 42 + movel #-ENOSYS,%sp@(PT_OFF_D0) /* needed for strace*/ 43 43 subql #4,%sp 44 44 SAVE_SWITCH_STACK 45 45 jbsr syscall_trace 46 46 RESTORE_SWITCH_STACK 47 47 addql #4,%sp 48 - movel %sp@(PT_ORIG_D0),%d1 48 + movel %sp@(PT_OFF_ORIG_D0),%d1 49 49 movel #-ENOSYS,%d0 50 50 cmpl #NR_syscalls,%d1 51 51 jcc 1f ··· 53 53 lea sys_call_table, %a0 54 54 jbsr %a0@(%d1) 55 55 56 - 1: movel %d0,%sp@(PT_D0) /* save the return value */ 56 + 1: movel %d0,%sp@(PT_OFF_D0) /* save the return value */ 57 57 subql #4,%sp /* dummy return address */ 58 58 SAVE_SWITCH_STACK 59 59 jbsr syscall_trace ··· 79 79 lea sys_call_table,%a0 80 80 movel %a0@(%d0), %a0 81 81 jbsr %a0@ 82 - movel %d0,%sp@(PT_D0) /* save the return value*/ 82 + movel %d0,%sp@(PT_OFF_D0) /* save the return value*/ 83 83 84 84 ret_from_exception: 85 - btst #5,%sp@(PT_SR) /* check if returning to kernel*/ 85 + btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel*/ 86 86 jeq Luser_return /* if so, skip resched, signals*/ 87 87 88 88 Lkernel_return: ··· 124 124 */ 125 125 inthandler: 126 126 SAVE_ALL 127 - movew %sp@(PT_VECTOR), %d0 127 + movew %sp@(PT_OFF_VECTOR), %d0 128 128 and.l #0x3ff, %d0 129 129 lsr.l #0x02, %d0 130 130 ··· 139 139 2: 140 140 RESTORE_ALL 141 141 1: 142 - moveb %sp@(PT_SR), %d0 142 + moveb %sp@(PT_OFF_SR), %d0 143 143 and #7, %d0 144 144 jhi 2b 145 145 /* check if we need to do software interrupts */
+10 -10
arch/m68knommu/platform/coldfire/entry.S
··· 81 81 82 82 movel %d3,%a0 83 83 jbsr %a0@ 84 - movel %d0,%sp@(PT_D0) /* save the return value */ 84 + movel %d0,%sp@(PT_OFF_D0) /* save the return value */ 85 85 jra ret_from_exception 86 86 1: 87 - movel #-ENOSYS,%d2 /* strace needs -ENOSYS in PT_D0 */ 88 - movel %d2,PT_D0(%sp) /* on syscall entry */ 87 + movel #-ENOSYS,%d2 /* strace needs -ENOSYS in PT_OFF_D0 */ 88 + movel %d2,PT_OFF_D0(%sp) /* on syscall entry */ 89 89 subql #4,%sp 90 90 SAVE_SWITCH_STACK 91 91 jbsr syscall_trace ··· 93 93 addql #4,%sp 94 94 movel %d3,%a0 95 95 jbsr %a0@ 96 - movel %d0,%sp@(PT_D0) /* save the return value */ 96 + movel %d0,%sp@(PT_OFF_D0) /* save the return value */ 97 97 subql #4,%sp /* dummy return address */ 98 98 SAVE_SWITCH_STACK 99 99 jbsr syscall_trace ··· 104 104 105 105 ret_from_exception: 106 106 move #0x2700,%sr /* disable intrs */ 107 - btst #5,%sp@(PT_SR) /* check if returning to kernel */ 107 + btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel */ 108 108 jeq Luser_return /* if so, skip resched, signals */ 109 109 110 110 #ifdef CONFIG_PREEMPT ··· 142 142 Lreturn: 143 143 move #0x2700,%sr /* disable intrs */ 144 144 movel sw_usp,%a0 /* get usp */ 145 - movel %sp@(PT_PC),%a0@- /* copy exception program counter */ 146 - movel %sp@(PT_FORMATVEC),%a0@-/* copy exception format/vector/sr */ 145 + movel %sp@(PT_OFF_PC),%a0@- /* copy exception program counter */ 146 + movel %sp@(PT_OFF_FORMATVEC),%a0@- /* copy exception format/vector/sr */ 147 147 moveml %sp@,%d1-%d5/%a0-%a2 148 148 lea %sp@(32),%sp /* space for 8 regs */ 149 149 movel %sp@+,%d0 ··· 181 181 ENTRY(inthandler) 182 182 SAVE_ALL 183 183 moveq #-1,%d0 184 - movel %d0,%sp@(PT_ORIG_D0) 184 + movel %d0,%sp@(PT_OFF_ORIG_D0) 185 185 186 - movew %sp@(PT_FORMATVEC),%d0 /* put exception # in d0 */ 186 + movew %sp@(PT_OFF_FORMATVEC),%d0 /* put exception # in d0 */ 187 187 andl #0x03fc,%d0 /* mask out vector only */ 188 188 189 189 movel %sp,%sp@- /* push regs arg */ ··· 203 203 ENTRY(fasthandler) 204 204 SAVE_LOCAL 205 205 206 - movew %sp@(PT_FORMATVEC),%d0 206 + movew %sp@(PT_OFF_FORMATVEC),%d0 207 207 andl #0x03fc,%d0 /* mask out vector only */ 208 208 209 209 movel %sp,%sp@- /* push regs arg */