[RFC,v2,02/12] m68k: Don't use asm-generic/bitops/lock.h

Message ID	1519657500-15094-3-git-send-email-will.deacon@arm.com
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Will Deacon <will.deacon@arm.com> To: linux-kernel@vger.kernel.org Cc: peterz@infradead.org, mingo@kernel.org, linux-arm-kernel@lists.infradead.org, yamada.masahiro@socionext.com, Will Deacon <will.deacon@arm.com> Subject: [RFC PATCH v2 02/12] m68k: Don't use asm-generic/bitops/lock.h Date: Mon, 26 Feb 2018 15:04:50 +0000 Message-Id: <1519657500-15094-3-git-send-email-will.deacon@arm.com> In-Reply-To: <1519657500-15094-1-git-send-email-will.deacon@arm.com> References: <1519657500-15094-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	Rewrite asm-generic/bitops/{atomic,lock}.h and use on arm64 \| expand [RFC,v2,00/12] Rewrite asm-generic/bitops/{atomic,lock}.h and use on arm64 [RFC,v2,01/12] h8300: Don't include linux/kernel.h in asm/atomic.h [RFC,v2,02/12] m68k: Don't use asm-generic/bitops/lock.h [RFC,v2,03/12] asm-generic: Move some macros from linux/bitops.h to a new bits.h file [RFC,v2,04/12] openrisc: Don't pull in all of linux/bitops.h in asm/cmpxchg.h [RFC,v2,05/12] sh: Don't pull in all of linux/bitops.h in asm/cmpxchg-xchg.h [RFC,v2,06/12] arm64: fpsimd: include <linux/init.h> in fpsimd.h [RFC,v2,07/12] arm64: lse: Include compiler_types.h and export.h for out-of-line LL/SC [RFC,v2,08/12] arm64: cmpxchg: Include build_bug.h instead of bug.h for BUILD_BUG [RFC,v2,09/12] asm-generic/bitops/atomic.h: Rewrite using atomic_fetch_* [RFC,v2,10/12] asm-generic/bitops/lock.h: Rewrite using atomic_fetch_* [RFC,v2,11/12] arm64: Replace our atomic/lock bitop implementations with asm-generic [RFC,v2,12/12] arm64: bitops: Include <asm-generic/bitops/ext2-atomic-setbit.h>

Message ID

1519657500-15094-3-git-send-email-will.deacon@arm.com

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Will Deacon <will.deacon@arm.com>
To: linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, mingo@kernel.org,
	linux-arm-kernel@lists.infradead.org,
	yamada.masahiro@socionext.com, Will Deacon <will.deacon@arm.com>
Subject: [RFC PATCH v2 02/12] m68k: Don't use asm-generic/bitops/lock.h
Date: Mon, 26 Feb 2018 15:04:50 +0000
Message-Id: <1519657500-15094-3-git-send-email-will.deacon@arm.com>
In-Reply-To: <1519657500-15094-1-git-send-email-will.deacon@arm.com>
References: <1519657500-15094-1-git-send-email-will.deacon@arm.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

Rewrite asm-generic/bitops/{atomic,lock}.h and use on arm64 | expand

Commit Message

Will Deacon Feb. 26, 2018, 3:04 p.m. UTC

asm-generic/bitops/lock.h is shortly going to be built on top of the
atomic_long_* API, which introduces a nasty circular dependency for
m68k where linux/atomic.h pulls in linux/bitops.h via:

	linux/atomic.h
	asm/atomic.h
	linux/irqflags.h
	asm/irqflags.h
	linux/preempt.h
	asm/preempt.h
	asm-generic/preempt.h
	linux/thread_info.h
	asm/thread_info.h
	asm/page.h
	asm-generic/getorder.h
	linux/log2.h
	linux/bitops.h

Since m68k isn't SMP and doesn't support ACQUIRE/RELEASE barriers, we
can just define the lock bitops in terms of the atomic bitops in the
asm/bitops.h header.

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Signed-off-by: Will Deacon <will.deacon@arm.com>

---
 arch/m68k/include/asm/bitops.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.1.4

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 */

[RFC,v2,02/12] m68k: Don't use asm-generic/bitops/lock.h

Commit Message

Patch