diff options
author | Greg Ungerer <gerg@uclinux.org> | 2009-09-20 07:32:32 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2009-09-29 20:06:07 -0400 |
commit | c84b564e82777b00ab48178a88bc533ba62b9922 (patch) | |
tree | 1d7e05891a86cf80d518b6498e9a87611e36ceb4 /arch/m68knommu/platform/68360 | |
parent | 63335138334e5ae40bf485a07b46be59397e50da (diff) |
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>
Diffstat (limited to 'arch/m68knommu/platform/68360')
-rw-r--r-- | arch/m68knommu/platform/68360/entry.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/m68knommu/platform/68360/entry.S b/arch/m68knommu/platform/68360/entry.S index 55dfefe3864..6d3460a39ca 100644 --- a/arch/m68knommu/platform/68360/entry.S +++ b/arch/m68knommu/platform/68360/entry.S | |||
@@ -35,17 +35,17 @@ | |||
35 | .globl inthandler | 35 | .globl inthandler |
36 | 36 | ||
37 | badsys: | 37 | badsys: |
38 | movel #-ENOSYS,%sp@(PT_D0) | 38 | movel #-ENOSYS,%sp@(PT_OFF_D0) |
39 | jra ret_from_exception | 39 | jra ret_from_exception |
40 | 40 | ||
41 | do_trace: | 41 | do_trace: |
42 | movel #-ENOSYS,%sp@(PT_D0) /* needed for strace*/ | 42 | movel #-ENOSYS,%sp@(PT_OFF_D0) /* needed for strace*/ |
43 | subql #4,%sp | 43 | subql #4,%sp |
44 | SAVE_SWITCH_STACK | 44 | SAVE_SWITCH_STACK |
45 | jbsr syscall_trace | 45 | jbsr syscall_trace |
46 | RESTORE_SWITCH_STACK | 46 | RESTORE_SWITCH_STACK |
47 | addql #4,%sp | 47 | addql #4,%sp |
48 | movel %sp@(PT_ORIG_D0),%d1 | 48 | movel %sp@(PT_OFF_ORIG_D0),%d1 |
49 | movel #-ENOSYS,%d0 | 49 | movel #-ENOSYS,%d0 |
50 | cmpl #NR_syscalls,%d1 | 50 | cmpl #NR_syscalls,%d1 |
51 | jcc 1f | 51 | jcc 1f |
@@ -53,7 +53,7 @@ do_trace: | |||
53 | lea sys_call_table, %a0 | 53 | lea sys_call_table, %a0 |
54 | jbsr %a0@(%d1) | 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 | subql #4,%sp /* dummy return address */ | 57 | subql #4,%sp /* dummy return address */ |
58 | SAVE_SWITCH_STACK | 58 | SAVE_SWITCH_STACK |
59 | jbsr syscall_trace | 59 | jbsr syscall_trace |
@@ -79,10 +79,10 @@ ENTRY(system_call) | |||
79 | lea sys_call_table,%a0 | 79 | lea sys_call_table,%a0 |
80 | movel %a0@(%d0), %a0 | 80 | movel %a0@(%d0), %a0 |
81 | jbsr %a0@ | 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 | ret_from_exception: | 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 | jeq Luser_return /* if so, skip resched, signals*/ | 86 | jeq Luser_return /* if so, skip resched, signals*/ |
87 | 87 | ||
88 | Lkernel_return: | 88 | Lkernel_return: |
@@ -124,7 +124,7 @@ Lreturn: | |||
124 | */ | 124 | */ |
125 | inthandler: | 125 | inthandler: |
126 | SAVE_ALL | 126 | SAVE_ALL |
127 | movew %sp@(PT_VECTOR), %d0 | 127 | movew %sp@(PT_OFF_VECTOR), %d0 |
128 | and.l #0x3ff, %d0 | 128 | and.l #0x3ff, %d0 |
129 | lsr.l #0x02, %d0 | 129 | lsr.l #0x02, %d0 |
130 | 130 | ||
@@ -139,7 +139,7 @@ ret_from_interrupt: | |||
139 | 2: | 139 | 2: |
140 | RESTORE_ALL | 140 | RESTORE_ALL |
141 | 1: | 141 | 1: |
142 | moveb %sp@(PT_SR), %d0 | 142 | moveb %sp@(PT_OFF_SR), %d0 |
143 | and #7, %d0 | 143 | and #7, %d0 |
144 | jhi 2b | 144 | jhi 2b |
145 | /* check if we need to do software interrupts */ | 145 | /* check if we need to do software interrupts */ |