summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/bitops_32.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-06-12 13:46:25 +0200
committerIngo Molnar <mingo@kernel.org>2014-06-12 13:46:37 +0200
commit535560d841b2d54f31280e05e9c6ffd19da0c4e7 (patch)
tree5320502c072284813f3d3d42412bd73e26130863 /arch/sparc/include/asm/bitops_32.h
parentf602d0632755be4f7eddfdd6c0af13216790177b (diff)
parent3cf2f34e1a3d4d5ff209d087925cf950e52f4805 (diff)
Merge commit '3cf2f34' into sched/core, to fix build error
Fix this dependency on the locking tree's smp_mb*() API changes: kernel/sched/idle.c:247:3: error: implicit declaration of function ‘smp_mb__after_atomic’ [-Werror=implicit-function-declaration] Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/include/asm/bitops_32.h')
-rw-r--r--arch/sparc/include/asm/bitops_32.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h
index 25a676653d4..88c9a962502 100644
--- a/arch/sparc/include/asm/bitops_32.h
+++ b/arch/sparc/include/asm/bitops_32.h
@@ -90,9 +90,6 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
#include <asm-generic/bitops/non-atomic.h>
-#define smp_mb__before_clear_bit() do { } while(0)
-#define smp_mb__after_clear_bit() do { } while(0)
-
#include <asm-generic/bitops/ffz.h>
#include <asm-generic/bitops/__ffs.h>
#include <asm-generic/bitops/sched.h>