aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/percpu.h
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-10-28 08:10:39 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-10-31 04:53:58 -0400
commitb226635ab82f5f5374dd6ccc9d257b41bcc41599 (patch)
treee7ec49d70267315e94db9cfa2758357677a37c42 /arch/s390/include/asm/percpu.h
parent4560e7c3317c7a2b370e36dadd3a3bac2ed70818 (diff)
s390/percpu: remove this_cpu_xor() implementation
this_cpu_xor() will be removed tree wide during the next merge window. To avoid merge conflicts s390's removal comes via the s390 tree. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/percpu.h')
-rw-r--r--arch/s390/include/asm/percpu.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/include/asm/percpu.h b/arch/s390/include/asm/percpu.h
index 061ab45faf70..fa91e0097458 100644
--- a/arch/s390/include/asm/percpu.h
+++ b/arch/s390/include/asm/percpu.h
@@ -50,8 +50,6 @@
50#define this_cpu_and_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, &) 50#define this_cpu_and_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, &)
51#define this_cpu_or_1(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |) 51#define this_cpu_or_1(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |)
52#define this_cpu_or_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |) 52#define this_cpu_or_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |)
53#define this_cpu_xor_1(pcp, val) arch_this_cpu_to_op_simple(pcp, val, ^)
54#define this_cpu_xor_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, ^)
55 53
56#ifndef CONFIG_HAVE_MARCH_Z196_FEATURES 54#ifndef CONFIG_HAVE_MARCH_Z196_FEATURES
57 55
@@ -63,8 +61,6 @@
63#define this_cpu_and_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, &) 61#define this_cpu_and_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, &)
64#define this_cpu_or_4(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |) 62#define this_cpu_or_4(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |)
65#define this_cpu_or_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |) 63#define this_cpu_or_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |)
66#define this_cpu_xor_4(pcp, val) arch_this_cpu_to_op_simple(pcp, val, ^)
67#define this_cpu_xor_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, ^)
68 64
69#else /* CONFIG_HAVE_MARCH_Z196_FEATURES */ 65#else /* CONFIG_HAVE_MARCH_Z196_FEATURES */
70 66
@@ -133,8 +129,6 @@
133#define this_cpu_and_8(pcp, val) arch_this_cpu_to_op(pcp, val, "lang") 129#define this_cpu_and_8(pcp, val) arch_this_cpu_to_op(pcp, val, "lang")
134#define this_cpu_or_4(pcp, val) arch_this_cpu_to_op(pcp, val, "lao") 130#define this_cpu_or_4(pcp, val) arch_this_cpu_to_op(pcp, val, "lao")
135#define this_cpu_or_8(pcp, val) arch_this_cpu_to_op(pcp, val, "laog") 131#define this_cpu_or_8(pcp, val) arch_this_cpu_to_op(pcp, val, "laog")
136#define this_cpu_xor_4(pcp, val) arch_this_cpu_to_op(pcp, val, "lax")
137#define this_cpu_xor_8(pcp, val) arch_this_cpu_to_op(pcp, val, "laxg")
138 132
139#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */ 133#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */
140 134