Commit eb67cf14 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Consolidate cpu_relax()/cpu_sleep() definitions across _32/_64. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f74c034d

arch/sh/include/asm/processor.h

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ extern struct sh_cpuinfo cpu_data[]; 
#define current_cpu_data cpu_data[smp_processor_id()]

#define raw_current_cpu_data cpu_data[raw_smp_processor_id()]



#define cpu_sleep()	__asm__ __volatile__ ("sleep" : : : "memory")

#define cpu_relax()	barrier()



/* Forward decl */

struct seq_operations;

arch/sh/include/asm/processor_32.h

+0 −3
Original line number Diff line number Diff line
@@ -183,9 +183,6 @@ extern unsigned long get_wchan(struct task_struct *p); 


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



#define cpu_sleep()	__asm__ __volatile__ ("sleep" : : : "memory")

#define cpu_relax()	barrier()



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

    defined(CONFIG_CPU_SH4)

#define PREFETCH_STRIDE		L1_CACHE_BYTES

arch/sh/include/asm/processor_64.h

+0 −2
Original line number Diff line number Diff line
@@ -228,7 +228,5 @@ extern unsigned long get_wchan(struct task_struct *p); 


#define user_stack_pointer(regs)	((regs)->sp)



#define cpu_relax()	barrier()



#endif	/* __ASSEMBLY__ */

#endif /* __ASM_SH_PROCESSOR_64_H */