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

Commit 6d0d2878 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Ingo Molnar
Browse files

locking/core: Provide common cpu_relax_yield() definition 



No need to duplicate the same define everywhere. Since
the only user is stop-machine and the only provider is
s390, we can use a default implementation of cpu_relax_yield()
in sched.h.

Suggested-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Noam Camus <noamc@ezchip.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: kvm@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-s390 <linux-s390@vger.kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: sparclinux@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/1479298985-191589-1-git-send-email-borntraeger@de.ibm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 43496d35

arch/alpha/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ unsigned long get_wchan(struct task_struct *p); 
  ((tsk) == current ? rdusp() : task_thread_info(tsk)->pcb.usp)



#define cpu_relax()	barrier()

#define cpu_relax_yield() cpu_relax()



#define ARCH_HAS_PREFETCH

#define ARCH_HAS_PREFETCHW

arch/arc/include/asm/processor.h

+0 −3
Original line number Diff line number Diff line
@@ -60,15 +60,12 @@ struct task_struct; 
#ifndef CONFIG_EZNPS_MTM_EXT



#define cpu_relax()		barrier()

#define cpu_relax_yield()	cpu_relax()



#else



#define cpu_relax()     \

	__asm__ __volatile__ (".word %0" : : "i"(CTOP_INST_SCHD_RW) : "memory")



#define cpu_relax_yield()	cpu_relax()



#endif



#define copy_segments(tsk, mm)      do { } while (0)

arch/arm/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ unsigned long get_wchan(struct task_struct *p); 
#define cpu_relax()			barrier()

#endif



#define cpu_relax_yield()  	              cpu_relax()



#define task_pt_regs(p) \

	((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)

arch/arm64/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ static inline void cpu_relax(void) 
	asm volatile("yield" ::: "memory");

}



#define cpu_relax_yield()                     cpu_relax()



/* Thread switching */

extern struct task_struct *cpu_switch_to(struct task_struct *prev,

					 struct task_struct *next);

arch/avr32/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ extern struct avr32_cpuinfo boot_cpu_data; 
#define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))



#define cpu_relax()		barrier()

#define cpu_relax_yield()	cpu_relax()

#define cpu_sync_pipeline()	asm volatile("sub pc, -2" : : : "memory")



struct cpu_context {