Skip to content

Commit b226635

Browse files
heicarstMartin Schwidefsky
authored andcommitted
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>
1 parent 4560e7c commit b226635

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

arch/s390/include/asm/percpu.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
#define this_cpu_and_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, &)
5151
#define this_cpu_or_1(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |)
5252
#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, ^)
5553

5654
#ifndef CONFIG_HAVE_MARCH_Z196_FEATURES
5755

@@ -63,8 +61,6 @@
6361
#define this_cpu_and_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, &)
6462
#define this_cpu_or_4(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |)
6563
#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, ^)
6864

6965
#else /* CONFIG_HAVE_MARCH_Z196_FEATURES */
7066

@@ -133,8 +129,6 @@
133129
#define this_cpu_and_8(pcp, val) arch_this_cpu_to_op(pcp, val, "lang")
134130
#define this_cpu_or_4(pcp, val) arch_this_cpu_to_op(pcp, val, "lao")
135131
#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")
138132

139133
#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */
140134

0 commit comments

Comments
 (0)