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

Commit 0702fbf5 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/percpu: use generic percpu ops for CONFIG_32BIT 



Remove the special cases for the this_cpu_* functions for 32 bit
in order to make it easier to add additional code for 64 bit.
32 bit will use the generic implementation.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent f26946d7

arch/s390/include/asm/percpu.h

+7 −19
Original line number Diff line number Diff line
@@ -10,12 +10,14 @@ 
 */

#define __my_cpu_offset S390_lowcore.percpu_offset



#ifdef CONFIG_64BIT



/*

 * For 64 bit module code, the module may be more than 4G above the

 * per cpu area, use weak definitions to force the compiler to

 * generate external references.

 */

#if defined(CONFIG_SMP) && defined(CONFIG_64BIT) && defined(MODULE)

#if defined(CONFIG_SMP) && defined(MODULE)

#define ARCH_NEEDS_WEAK_PER_CPU

#endif
@@ -30,13 +32,7 @@ 
	do {								\

		old__ = prev__;						\

		new__ = old__ op (val);					\

		switch (sizeof(*ptr__)) {				\

		case 8:							\

			prev__ = cmpxchg64(ptr__, old__, new__);	\

			break;						\

		default:						\

		prev__ = cmpxchg(ptr__, old__, new__);			\

		}							\

	} while (prev__ != old__);					\

	preempt_enable();						\

	new__;								\
@@ -74,13 +70,7 @@ 
	pcp_op_T__ *ptr__;						\

	preempt_disable();						\

	ptr__ = __this_cpu_ptr(&(pcp));					\

	switch (sizeof(*ptr__)) {					\

	case 8:								\

		ret__ = cmpxchg64(ptr__, oval, nval);			\

		break;							\

	default:							\

	ret__ = cmpxchg(ptr__, oval, nval);				\

	}								\

	preempt_enable();						\

	ret__;								\

})
@@ -104,9 +94,7 @@ 
#define this_cpu_xchg_1(pcp, nval) arch_this_cpu_xchg(pcp, nval)

#define this_cpu_xchg_2(pcp, nval) arch_this_cpu_xchg(pcp, nval)

#define this_cpu_xchg_4(pcp, nval) arch_this_cpu_xchg(pcp, nval)

#ifdef CONFIG_64BIT

#define this_cpu_xchg_8(pcp, nval) arch_this_cpu_xchg(pcp, nval)

#endif



#define arch_this_cpu_cmpxchg_double(pcp1, pcp2, o1, o2, n1, n2)	\

({									\
@@ -124,9 +112,9 @@ 
})



#define this_cpu_cmpxchg_double_4 arch_this_cpu_cmpxchg_double

#ifdef CONFIG_64BIT

#define this_cpu_cmpxchg_double_8 arch_this_cpu_cmpxchg_double

#endif



#endif /* CONFIG_64BIT */



#include <asm-generic/percpu.h>