Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390/cmpxchg: remove dead code

With the removal of 31 bit support a couple of defines became unused.
Remove them.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Heiko Carstens and committed by
Martin Schwidefsky
e4165dcb 004f0bba

+3 -27
+3 -27
arch/s390/include/asm/cmpxchg.h
··· 32 32 __old; \ 33 33 }) 34 34 35 - #define __cmpxchg_double_op(p1, p2, o1, o2, n1, n2, insn) \ 35 + #define __cmpxchg_double(p1, p2, o1, o2, n1, n2) \ 36 36 ({ \ 37 37 register __typeof__(*(p1)) __old1 asm("2") = (o1); \ 38 38 register __typeof__(*(p2)) __old2 asm("3") = (o2); \ ··· 40 40 register __typeof__(*(p2)) __new2 asm("5") = (n2); \ 41 41 int cc; \ 42 42 asm volatile( \ 43 - insn " %[old],%[new],%[ptr]\n" \ 43 + " cdsg %[old],%[new],%[ptr]\n" \ 44 44 " ipm %[cc]\n" \ 45 45 " srl %[cc],28" \ 46 46 : [cc] "=d" (cc), [old] "+d" (__old1), "+d" (__old2) \ ··· 50 50 !cc; \ 51 51 }) 52 52 53 - #define __cmpxchg_double_4(p1, p2, o1, o2, n1, n2) \ 54 - __cmpxchg_double_op(p1, p2, o1, o2, n1, n2, "cds") 55 - 56 - #define __cmpxchg_double_8(p1, p2, o1, o2, n1, n2) \ 57 - __cmpxchg_double_op(p1, p2, o1, o2, n1, n2, "cdsg") 58 - 59 - extern void __cmpxchg_double_called_with_bad_pointer(void); 60 - 61 - #define __cmpxchg_double(p1, p2, o1, o2, n1, n2) \ 62 - ({ \ 63 - int __ret; \ 64 - switch (sizeof(*(p1))) { \ 65 - case 4: \ 66 - __ret = __cmpxchg_double_4(p1, p2, o1, o2, n1, n2); \ 67 - break; \ 68 - case 8: \ 69 - __ret = __cmpxchg_double_8(p1, p2, o1, o2, n1, n2); \ 70 - break; \ 71 - default: \ 72 - __cmpxchg_double_called_with_bad_pointer(); \ 73 - } \ 74 - __ret; \ 75 - }) 76 - 77 53 #define cmpxchg_double(p1, p2, o1, o2, n1, n2) \ 78 54 ({ \ 79 55 __typeof__(p1) __p1 = (p1); \ ··· 57 81 BUILD_BUG_ON(sizeof(*(p1)) != sizeof(long)); \ 58 82 BUILD_BUG_ON(sizeof(*(p2)) != sizeof(long)); \ 59 83 VM_BUG_ON((unsigned long)((__p1) + 1) != (unsigned long)(__p2));\ 60 - __cmpxchg_double_8(__p1, __p2, o1, o2, n1, n2); \ 84 + __cmpxchg_double(__p1, __p2, o1, o2, n1, n2); \ 61 85 }) 62 86 63 87 #define system_has_cmpxchg_double() 1