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>,
Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: [PATCH v2 1/9] h8300: Don't include linux/kernel.h in asm/atomic.h
Date: Fri, 1 Jun 2018 17:06:21 +0100 [thread overview]
Message-ID: <1527869189-31512-2-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1527869189-31512-1-git-send-email-will.deacon@arm.com>
linux/kernel.h isn't needed by asm/atomic.h and will result in circular
dependencies when the asm-generic atomic bitops are built around the
tomic_long_t interface.
Remove the broad include and replace it with linux/compiler.h for
READ_ONCE etc and asm/irqflags.h for arch_local_irq_save etc.
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/h8300/include/asm/atomic.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h
index 941e7554e886..b174dec099bf 100644
--- a/arch/h8300/include/asm/atomic.h
+++ b/arch/h8300/include/asm/atomic.h
@@ -2,8 +2,10 @@
#ifndef __ARCH_H8300_ATOMIC__
#define __ARCH_H8300_ATOMIC__
+#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/cmpxchg.h>
+#include <asm/irqflags.h>
/*
* Atomic operations that C can't guarantee us. Useful for
@@ -15,8 +17,6 @@
#define atomic_read(v) READ_ONCE((v)->counter)
#define atomic_set(v, i) WRITE_ONCE(((v)->counter), (i))
-#include <linux/kernel.h>
-
#define ATOMIC_OP_RETURN(op, c_op) \
static inline int atomic_##op##_return(int i, atomic_t *v) \
{ \
--
2.1.4
next prev parent reply other threads:[~2018-06-01 16:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-01 16:06 [PATCH v2 0/9] Rewrite asm-generic/bitops/{atomic,lock}.h and use on arm64 Will Deacon
2018-06-01 16:06 ` Will Deacon [this message]
2018-07-22 14:06 ` [PATCH v2 1/9] h8300: Don't include linux/kernel.h in asm/atomic.h Yoshinori Sato
2018-06-01 16:06 ` [PATCH v2 2/9] m68k: Don't use asm-generic/bitops/lock.h Will Deacon
2018-06-01 16:06 ` [PATCH v2 3/9] asm-generic: Move some macros from linux/bitops.h to a new bits.h file Will Deacon
2018-06-01 16:06 ` [PATCH v2 4/9] openrisc: Don't pull in all of linux/bitops.h in asm/cmpxchg.h Will Deacon
2018-06-01 16:06 ` [PATCH v2 5/9] sh: Don't pull in all of linux/bitops.h in asm/cmpxchg-xchg.h Will Deacon
2018-06-01 16:06 ` [PATCH v2 6/9] asm-generic/bitops/atomic.h: Rewrite using atomic_* Will Deacon
2018-06-01 16:06 ` [PATCH v2 7/9] asm-generic/bitops/lock.h: Rewrite using atomic_fetch_* Will Deacon
2018-06-01 16:06 ` [PATCH v2 8/9] arm64: Replace our atomic/lock bitop implementations with asm-generic Will Deacon
2018-06-01 16:06 ` [PATCH v2 9/9] arm64: bitops: Include <asm-generic/bitops/ext2-atomic-setbit.h> Will Deacon
2018-06-04 7:40 ` [PATCH v2 0/9] Rewrite asm-generic/bitops/{atomic,lock}.h and use on arm64 Peter Zijlstra
2018-06-04 9:04 ` 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=1527869189-31512-2-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 \
--cc=ysato@users.sourceforge.jp \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).