diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-01-22 10:16:14 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-01-29 01:41:15 -0500 |
commit | dc66ff6220f0a6c938df41add526d645852d9a75 (patch) | |
tree | 848403ef7935b3f977ac95f1e69837bbfb8e2ede /arch/sh/include | |
parent | 84fdf6cda30df72994baa2496da86787fb44cbb4 (diff) |
SH: fix start_thread and user_stack_pointer macros
Fix macros start_thread and user_stack_pointer.
When these macros aren't called with a variable named regs as second
argument, this will result in a build failure.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
-rw-r--r-- | arch/sh/include/asm/kprobes.h | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/processor_32.h | 12 | ||||
-rw-r--r-- | arch/sh/include/asm/processor_64.h | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/arch/sh/include/asm/kprobes.h b/arch/sh/include/asm/kprobes.h index 6078d8e551d4..613644a758e8 100644 --- a/arch/sh/include/asm/kprobes.h +++ b/arch/sh/include/asm/kprobes.h | |||
@@ -16,7 +16,7 @@ typedef u16 kprobe_opcode_t; | |||
16 | ? (MAX_STACK_SIZE) \ | 16 | ? (MAX_STACK_SIZE) \ |
17 | : (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR))) | 17 | : (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR))) |
18 | 18 | ||
19 | #define regs_return_value(regs) ((regs)->regs[0]) | 19 | #define regs_return_value(_regs) ((_regs)->regs[0]) |
20 | #define flush_insn_slot(p) do { } while (0) | 20 | #define flush_insn_slot(p) do { } while (0) |
21 | #define kretprobe_blacklist_size 0 | 21 | #define kretprobe_blacklist_size 0 |
22 | 22 | ||
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h index d79063c5eb9c..dcaed24c71fc 100644 --- a/arch/sh/include/asm/processor_32.h +++ b/arch/sh/include/asm/processor_32.h | |||
@@ -108,12 +108,12 @@ extern int ubc_usercnt; | |||
108 | /* | 108 | /* |
109 | * Do necessary setup to start up a newly executed thread. | 109 | * Do necessary setup to start up a newly executed thread. |
110 | */ | 110 | */ |
111 | #define start_thread(regs, new_pc, new_sp) \ | 111 | #define start_thread(_regs, new_pc, new_sp) \ |
112 | set_fs(USER_DS); \ | 112 | set_fs(USER_DS); \ |
113 | regs->pr = 0; \ | 113 | _regs->pr = 0; \ |
114 | regs->sr = SR_FD; /* User mode. */ \ | 114 | _regs->sr = SR_FD; /* User mode. */ \ |
115 | regs->pc = new_pc; \ | 115 | _regs->pc = new_pc; \ |
116 | regs->regs[15] = new_sp | 116 | _regs->regs[15] = new_sp |
117 | 117 | ||
118 | /* Forward declaration, a strange C thing */ | 118 | /* Forward declaration, a strange C thing */ |
119 | struct task_struct; | 119 | struct task_struct; |
@@ -189,7 +189,7 @@ extern unsigned long get_wchan(struct task_struct *p); | |||
189 | #define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc) | 189 | #define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc) |
190 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->regs[15]) | 190 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->regs[15]) |
191 | 191 | ||
192 | #define user_stack_pointer(regs) ((regs)->regs[15]) | 192 | #define user_stack_pointer(_regs) ((_regs)->regs[15]) |
193 | 193 | ||
194 | #if defined(CONFIG_CPU_SH2A) || defined(CONFIG_CPU_SH3) || \ | 194 | #if defined(CONFIG_CPU_SH2A) || defined(CONFIG_CPU_SH3) || \ |
195 | defined(CONFIG_CPU_SH4) | 195 | defined(CONFIG_CPU_SH4) |
diff --git a/arch/sh/include/asm/processor_64.h b/arch/sh/include/asm/processor_64.h index 803177fcf086..5727d31b0ccf 100644 --- a/arch/sh/include/asm/processor_64.h +++ b/arch/sh/include/asm/processor_64.h | |||
@@ -145,13 +145,13 @@ struct thread_struct { | |||
145 | */ | 145 | */ |
146 | #define SR_USER (SR_MMU | SR_FD) | 146 | #define SR_USER (SR_MMU | SR_FD) |
147 | 147 | ||
148 | #define start_thread(regs, new_pc, new_sp) \ | 148 | #define start_thread(_regs, new_pc, new_sp) \ |
149 | set_fs(USER_DS); \ | 149 | set_fs(USER_DS); \ |
150 | regs->sr = SR_USER; /* User mode. */ \ | 150 | _regs->sr = SR_USER; /* User mode. */ \ |
151 | regs->pc = new_pc - 4; /* Compensate syscall exit */ \ | 151 | _regs->pc = new_pc - 4; /* Compensate syscall exit */ \ |
152 | regs->pc |= 1; /* Set SHmedia ! */ \ | 152 | _regs->pc |= 1; /* Set SHmedia ! */ \ |
153 | regs->regs[18] = 0; \ | 153 | _regs->regs[18] = 0; \ |
154 | regs->regs[15] = new_sp | 154 | _regs->regs[15] = new_sp |
155 | 155 | ||
156 | /* Forward declaration, a strange C thing */ | 156 | /* Forward declaration, a strange C thing */ |
157 | struct task_struct; | 157 | struct task_struct; |
@@ -226,7 +226,7 @@ extern unsigned long get_wchan(struct task_struct *p); | |||
226 | #define KSTK_EIP(tsk) ((tsk)->thread.pc) | 226 | #define KSTK_EIP(tsk) ((tsk)->thread.pc) |
227 | #define KSTK_ESP(tsk) ((tsk)->thread.sp) | 227 | #define KSTK_ESP(tsk) ((tsk)->thread.sp) |
228 | 228 | ||
229 | #define user_stack_pointer(regs) ((regs)->regs[15]) | 229 | #define user_stack_pointer(_regs) ((_regs)->regs[15]) |
230 | 230 | ||
231 | #endif /* __ASSEMBLY__ */ | 231 | #endif /* __ASSEMBLY__ */ |
232 | #endif /* __ASM_SH_PROCESSOR_64_H */ | 232 | #endif /* __ASM_SH_PROCESSOR_64_H */ |