Hi Will,
On Wed, Feb 21, 2018 at 5:02 PM, Will Deacon <will.deacon@xxxxxxx> wrote:
On Wed, Feb 21, 2018 at 03:54:31PM +0000, Will Deacon wrote:
My ideas for fixing this so far are one of:
1. Inline the old asm-generic/bitops/lock.h code directly into m68k's
asm/bitops.h
2. Continue implementing asm-generic/bitops/lock.h purely as macros without
any #includes
3. Remove the hardirqs_count thing from m6k's asm/irqflags.h
Any ideas? (1) is my preference at the moment.
Which would look like the diff below...
Thanks, looks good to me, so
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Will
--->8
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
index 93b47b1f6fb4..18193419f97d 100644
--- a/arch/m68k/include/asm/bitops.h
+++ b/arch/m68k/include/asm/bitops.h
@@ -515,12 +515,16 @@ static inline int __fls(int x)
#endif
+/* Simple test-and-set bit locks */
+#define test_and_set_bit_lock test_and_set_bit
+#define clear_bit_unlock clear_bit
+#define __clear_bit_unlock clear_bit_unlock
+
#include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/fls64.h>
#include <asm-generic/bitops/sched.h>
#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/lock.h>
#endif /* __KERNEL__ */
#endif /* _M68K_BITOPS_H */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
