From: Yury Norov <ynorov@caviumnetworks.com> To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Yury Norov <ynorov@caviumnetworks.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnd Bergmann <arnd@arndb.de>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Jan Glauber <jglauber@cavium.com> Subject: [PATCH 2/3] asm-generic: don't #include <linux/atomic.h> in qspinlock_types.h Date: Tue, 11 Apr 2017 01:35:03 +0400 [thread overview] Message-ID: <1491860104-4103-3-git-send-email-ynorov@caviumnetworks.com> (raw) In-Reply-To: <1491860104-4103-1-git-send-email-ynorov@caviumnetworks.com> The "qspinlock_types.h" doesn't need linux/atomic.h directly. So because of this, and because including of it requires the protection against recursive inclusion, it looks reasonable to move the inclusion exactly where it is needed. This change affects the x86_64 arch, as the only user of qspinlocks at now. I have build-tested the change on x86_64 with CONFIG_PARAVIRT enabled and disabled. Signed-off-by: Yury Norov <ynorov@caviumnetworks.com> --- include/asm-generic/qspinlock.h | 1 + include/asm-generic/qspinlock_types.h | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h index 9f0681b..5f4d42a 100644 --- a/include/asm-generic/qspinlock.h +++ b/include/asm-generic/qspinlock.h @@ -20,6 +20,7 @@ #define __ASM_GENERIC_QSPINLOCK_H #include <asm-generic/qspinlock_types.h> +#include <linux/atomic.h> /** * queued_spin_unlock_wait - wait until the _current_ lock holder releases the lock diff --git a/include/asm-generic/qspinlock_types.h b/include/asm-generic/qspinlock_types.h index 034acd0..a13cc90 100644 --- a/include/asm-generic/qspinlock_types.h +++ b/include/asm-generic/qspinlock_types.h @@ -18,15 +18,7 @@ #ifndef __ASM_GENERIC_QSPINLOCK_TYPES_H #define __ASM_GENERIC_QSPINLOCK_TYPES_H -/* - * Including atomic.h with PARAVIRT on will cause compilation errors because - * of recursive header file incluson via paravirt_types.h. So don't include - * it if PARAVIRT is on. - */ -#ifndef CONFIG_PARAVIRT #include <linux/types.h> -#include <linux/atomic.h> -#endif typedef struct qspinlock { atomic_t val; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: ynorov@caviumnetworks.com (Yury Norov) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] asm-generic: don't #include <linux/atomic.h> in qspinlock_types.h Date: Tue, 11 Apr 2017 01:35:03 +0400 [thread overview] Message-ID: <1491860104-4103-3-git-send-email-ynorov@caviumnetworks.com> (raw) In-Reply-To: <1491860104-4103-1-git-send-email-ynorov@caviumnetworks.com> The "qspinlock_types.h" doesn't need linux/atomic.h directly. So because of this, and because including of it requires the protection against recursive inclusion, it looks reasonable to move the inclusion exactly where it is needed. This change affects the x86_64 arch, as the only user of qspinlocks at now. I have build-tested the change on x86_64 with CONFIG_PARAVIRT enabled and disabled. Signed-off-by: Yury Norov <ynorov@caviumnetworks.com> --- include/asm-generic/qspinlock.h | 1 + include/asm-generic/qspinlock_types.h | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h index 9f0681b..5f4d42a 100644 --- a/include/asm-generic/qspinlock.h +++ b/include/asm-generic/qspinlock.h @@ -20,6 +20,7 @@ #define __ASM_GENERIC_QSPINLOCK_H #include <asm-generic/qspinlock_types.h> +#include <linux/atomic.h> /** * queued_spin_unlock_wait - wait until the _current_ lock holder releases the lock diff --git a/include/asm-generic/qspinlock_types.h b/include/asm-generic/qspinlock_types.h index 034acd0..a13cc90 100644 --- a/include/asm-generic/qspinlock_types.h +++ b/include/asm-generic/qspinlock_types.h @@ -18,15 +18,7 @@ #ifndef __ASM_GENERIC_QSPINLOCK_TYPES_H #define __ASM_GENERIC_QSPINLOCK_TYPES_H -/* - * Including atomic.h with PARAVIRT on will cause compilation errors because - * of recursive header file incluson via paravirt_types.h. So don't include - * it if PARAVIRT is on. - */ -#ifndef CONFIG_PARAVIRT #include <linux/types.h> -#include <linux/atomic.h> -#endif typedef struct qspinlock { atomic_t val; -- 2.7.4
next prev parent reply other threads:[~2017-04-10 21:35 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-10 21:35 [RFC PATCH 0/3] arm64: queued spinlocks and rw-locks Yury Norov 2017-04-10 21:35 ` Yury Norov 2017-04-10 21:35 ` [PATCH 1/3] kernel/locking: #include <asm/spinlock.h> in qrwlock.c Yury Norov 2017-04-10 21:35 ` Yury Norov 2017-04-10 21:35 ` Yury Norov [this message] 2017-04-10 21:35 ` [PATCH 2/3] asm-generic: don't #include <linux/atomic.h> in qspinlock_types.h Yury Norov 2017-04-10 21:35 ` [PATCH 3/3] arm64/locking: qspinlocks and qrwlocks support Yury Norov 2017-04-10 21:35 ` Yury Norov 2017-04-13 18:12 ` Peter Zijlstra 2017-04-13 18:12 ` Peter Zijlstra 2017-04-20 18:23 ` Yury Norov 2017-04-20 18:23 ` Yury Norov 2017-04-20 19:00 ` Mark Rutland 2017-04-20 19:00 ` Mark Rutland 2017-04-20 19:05 ` Peter Zijlstra 2017-04-20 19:05 ` Peter Zijlstra 2017-04-26 12:39 ` Yury Norov 2017-04-26 12:39 ` Yury Norov 2017-04-28 15:44 ` Will Deacon 2017-04-28 15:44 ` Will Deacon 2017-04-12 17:04 ` [RFC PATCH 0/3] arm64: queued spinlocks and rw-locks Adam Wallis 2017-04-12 17:04 ` Adam Wallis 2017-04-13 10:33 ` Yury Norov 2017-04-13 10:33 ` Yury Norov 2017-04-28 15:37 ` Will Deacon 2017-04-28 15:37 ` Will Deacon 2017-04-24 13:36 ` Will Deacon 2017-04-24 13:36 ` Will Deacon 2017-05-03 14:51 [PATCH " Yury Norov 2017-05-03 14:51 ` [PATCH 2/3] asm-generic: don't #include <linux/atomic.h> in qspinlock_types.h Yury Norov 2017-05-03 14:51 ` Yury Norov 2017-05-04 8:01 ` Arnd Bergmann 2017-05-04 8:01 ` Arnd Bergmann
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=1491860104-4103-3-git-send-email-ynorov@caviumnetworks.com \ --to=ynorov@caviumnetworks.com \ --cc=arnd@arndb.de \ --cc=catalin.marinas@arm.com \ --cc=jglauber@cavium.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=will.deacon@arm.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: linkBe 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.