All of lore.kernel.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <1519657500-15094-3-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1519657500-15094-1-git-send-email-will.deacon@arm.com>

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(-)

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

WARNING: multiple messages have this Message-ID (diff)
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH v2 02/12] m68k: Don't use asm-generic/bitops/lock.h
Date: Mon, 26 Feb 2018 15:04:50 +0000	[thread overview]
Message-ID: <1519657500-15094-3-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1519657500-15094-1-git-send-email-will.deacon@arm.com>

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(-)

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

  parent reply	other threads:[~2018-02-26 15:05 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-26 15:04 [RFC PATCH v2 00/12] Rewrite asm-generic/bitops/{atomic,lock}.h and use on arm64 Will Deacon
2018-02-26 15:04 ` [RFC PATCH v2 00/12] Rewrite asm-generic/bitops/{atomic, lock}.h " Will Deacon
2018-02-26 15:04 ` [RFC PATCH v2 01/12] h8300: Don't include linux/kernel.h in asm/atomic.h Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:04 ` Will Deacon [this message]
2018-02-26 15:04   ` [RFC PATCH v2 02/12] m68k: Don't use asm-generic/bitops/lock.h Will Deacon
2018-02-26 15:04 ` [RFC PATCH v2 03/12] asm-generic: Move some macros from linux/bitops.h to a new bits.h file Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:04 ` [RFC PATCH v2 04/12] openrisc: Don't pull in all of linux/bitops.h in asm/cmpxchg.h Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:04 ` [RFC PATCH v2 05/12] sh: Don't pull in all of linux/bitops.h in asm/cmpxchg-xchg.h Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:04 ` [RFC PATCH v2 06/12] arm64: fpsimd: include <linux/init.h> in fpsimd.h Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:37   ` Mark Rutland
2018-02-26 15:37     ` Mark Rutland
2018-02-26 15:04 ` [RFC PATCH v2 07/12] arm64: lse: Include compiler_types.h and export.h for out-of-line LL/SC Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:42   ` Mark Rutland
2018-02-26 15:42     ` Mark Rutland
2018-02-26 15:04 ` [RFC PATCH v2 08/12] arm64: cmpxchg: Include build_bug.h instead of bug.h for BUILD_BUG Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:48   ` Mark Rutland
2018-02-26 15:48     ` Mark Rutland
2018-02-27 17:33     ` Will Deacon
2018-02-27 17:33       ` Will Deacon
2018-02-27 17:34       ` Mark Rutland
2018-02-27 17:34         ` Mark Rutland
2018-02-26 15:04 ` [RFC PATCH v2 09/12] asm-generic/bitops/atomic.h: Rewrite using atomic_fetch_* Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:04 ` [RFC PATCH v2 10/12] asm-generic/bitops/lock.h: " Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:04 ` [RFC PATCH v2 11/12] arm64: Replace our atomic/lock bitop implementations with asm-generic Will Deacon
2018-02-26 15:04   ` Will Deacon
2018-02-26 15:05 ` [RFC PATCH v2 12/12] arm64: bitops: Include <asm-generic/bitops/ext2-atomic-setbit.h> Will Deacon
2018-02-26 15:05   ` Will Deacon
2018-03-01  7:16 ` [RFC PATCH v2 00/12] Rewrite asm-generic/bitops/{atomic,lock}.h and use on arm64 Masahiro Yamada
2018-03-01  7:16   ` Masahiro Yamada
2018-03-12  3:56   ` Masahiro Yamada
2018-03-12  3:56     ` Masahiro Yamada
2018-03-19 17:21     ` Will Deacon
2018-03-19 17:21       ` Will Deacon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519657500-15094-3-git-send-email-will.deacon@arm.com \
    --to=will.deacon@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=yamada.masahiro@socionext.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.