diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-10-28 13:10:39 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-10-31 09:53:58 +0100 |
| commit | b226635ab82f5f5374dd6ccc9d257b41bcc41599 (patch) | |
| tree | e7ec49d70267315e94db9cfa2758357677a37c42 | |
| parent | 4560e7c3317c7a2b370e36dadd3a3bac2ed70818 (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>
| -rw-r--r-- | arch/s390/include/asm/percpu.h | 6 |
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 @@ #define this_cpu_and_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, &) #define this_cpu_or_1(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |) #define this_cpu_or_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |) -#define this_cpu_xor_1(pcp, val) arch_this_cpu_to_op_simple(pcp, val, ^) -#define this_cpu_xor_2(pcp, val) arch_this_cpu_to_op_simple(pcp, val, ^) #ifndef CONFIG_HAVE_MARCH_Z196_FEATURES @@ -63,8 +61,6 @@ #define this_cpu_and_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, &) #define this_cpu_or_4(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |) #define this_cpu_or_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, |) -#define this_cpu_xor_4(pcp, val) arch_this_cpu_to_op_simple(pcp, val, ^) -#define this_cpu_xor_8(pcp, val) arch_this_cpu_to_op_simple(pcp, val, ^) #else /* CONFIG_HAVE_MARCH_Z196_FEATURES */ @@ -133,8 +129,6 @@ #define this_cpu_and_8(pcp, val) arch_this_cpu_to_op(pcp, val, "lang") #define this_cpu_or_4(pcp, val) arch_this_cpu_to_op(pcp, val, "lao") #define this_cpu_or_8(pcp, val) arch_this_cpu_to_op(pcp, val, "laog") -#define this_cpu_xor_4(pcp, val) arch_this_cpu_to_op(pcp, val, "lax") -#define this_cpu_xor_8(pcp, val) arch_this_cpu_to_op(pcp, val, "laxg") #endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */ |