Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc66ff62 authored by Roel Kluin's avatar Roel Kluin Committed by Paul Mundt
Browse files

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: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 84fdf6cd

arch/sh/include/asm/kprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ typedef u16 kprobe_opcode_t; 
	? (MAX_STACK_SIZE) \

	: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))



#define regs_return_value(regs)		((regs)->regs[0])

#define regs_return_value(_regs)		((_regs)->regs[0])

#define flush_insn_slot(p)		do { } while (0)

#define kretprobe_blacklist_size	0

arch/sh/include/asm/processor_32.h

+6 −6
Original line number Diff line number Diff line
@@ -108,12 +108,12 @@ extern int ubc_usercnt; 
/*

 * Do necessary setup to start up a newly executed thread.

 */

#define start_thread(regs, new_pc, new_sp)	 \

#define start_thread(_regs, new_pc, new_sp)	 \

	set_fs(USER_DS);			 \

	regs->pr = 0;				 \

	regs->sr = SR_FD;	/* User mode. */ \

	regs->pc = new_pc;			 \

	regs->regs[15] = new_sp

	_regs->pr = 0;				 \

	_regs->sr = SR_FD;	/* User mode. */ \

	_regs->pc = new_pc;			 \

	_regs->regs[15] = new_sp



/* Forward declaration, a strange C thing */

struct task_struct;
@@ -189,7 +189,7 @@ extern unsigned long get_wchan(struct task_struct *p); 
#define KSTK_EIP(tsk)  (task_pt_regs(tsk)->pc)

#define KSTK_ESP(tsk)  (task_pt_regs(tsk)->regs[15])



#define user_stack_pointer(regs)	((regs)->regs[15])

#define user_stack_pointer(_regs)	((_regs)->regs[15])



#if defined(CONFIG_CPU_SH2A) || defined(CONFIG_CPU_SH3) || \

    defined(CONFIG_CPU_SH4)

arch/sh/include/asm/processor_64.h

+7 −7
Original line number Diff line number Diff line
@@ -145,13 +145,13 @@ struct thread_struct { 
 */

#define SR_USER (SR_MMU | SR_FD)



#define start_thread(regs, new_pc, new_sp)			\

#define start_thread(_regs, new_pc, new_sp)			\

	set_fs(USER_DS);					\

	regs->sr = SR_USER;	/* User mode. */		\

	regs->pc = new_pc - 4;	/* Compensate syscall exit */	\

	regs->pc |= 1;		/* Set SHmedia ! */		\

	regs->regs[18] = 0;					\

	regs->regs[15] = new_sp

	_regs->sr = SR_USER;	/* User mode. */		\

	_regs->pc = new_pc - 4;	/* Compensate syscall exit */	\

	_regs->pc |= 1;		/* Set SHmedia ! */		\

	_regs->regs[18] = 0;					\

	_regs->regs[15] = new_sp



/* Forward declaration, a strange C thing */

struct task_struct;
@@ -226,7 +226,7 @@ extern unsigned long get_wchan(struct task_struct *p); 
#define KSTK_EIP(tsk)  ((tsk)->thread.pc)

#define KSTK_ESP(tsk)  ((tsk)->thread.sp)



#define user_stack_pointer(regs)	((regs)->regs[15])

#define user_stack_pointer(_regs)	((_regs)->regs[15])



#endif	/* __ASSEMBLY__ */

#endif /* __ASM_SH_PROCESSOR_64_H */