From: Marc Zyngier <marc.zyngier@arm.com>
To: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org,
kvmarm@lists.cs.columbia.edu
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>
Subject: [PATCH v3 03/19] arm64: asm-offsets: Remove potential circular dependency
Date: Mon, 18 Dec 2017 17:39:10 +0000 [thread overview]
Message-ID: <20171218173926.16911-4-marc.zyngier@arm.com> (raw)
In-Reply-To: <20171218173926.16911-1-marc.zyngier@arm.com>
So far, we've been lucky enough that none of the include files
that asm-offsets.c requires include asm-offsets.h. This is
about to change, and would introduce a nasty circular dependency...
Let's now guard the inclusion of asm-offsets.h so that it never
gets pulled from asm-offsets.c. The same issue exists between
bounce.c and include/generated/bounds.h, and is worked around
by using the existing guard symbol.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm64/include/asm/asm-offsets.h | 2 ++
arch/arm64/kernel/asm-offsets.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/arch/arm64/include/asm/asm-offsets.h b/arch/arm64/include/asm/asm-offsets.h
index d370ee36a182..7d6531a81eb3 100644
--- a/arch/arm64/include/asm/asm-offsets.h
+++ b/arch/arm64/include/asm/asm-offsets.h
@@ -1 +1,3 @@
+#if !defined(__GENERATING_ASM_OFFSETS_H) && !defined(__GENERATING_BOUNDS_H)
#include <generated/asm-offsets.h>
+#endif
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 742887330101..5ab8841af382 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -18,6 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#define __GENERATING_ASM_OFFSETS_H 1
+
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/dma-mapping.h>
--
2.14.2
next prev parent reply other threads:[~2017-12-18 17:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-18 17:39 [PATCH v3 00/19] KVM/arm64: Randomise EL2 mappings Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 01/19] arm64: asm-offsets: Avoid clashing DMA definitions Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 02/19] arm64: asm-offsets: Remove unused definitions Marc Zyngier
2017-12-18 17:39 ` Marc Zyngier [this message]
2017-12-18 17:39 ` [PATCH v3 04/19] arm64: alternatives: Enforce alignment of struct alt_instr Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 05/19] arm64: alternatives: Add dynamic patching feature Marc Zyngier
2017-12-19 13:04 ` Steve Capper
2017-12-19 13:32 ` Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 06/19] arm64: insn: Add N immediate encoding Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 07/19] arm64: insn: Add encoder for bitwise operations using literals Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 08/19] arm64: KVM: Dynamically patch the kernel/hyp VA mask Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 09/19] arm64: cpufeatures: Drop the ARM64_HYP_OFFSET_LOW feature flag Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 10/19] KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 11/19] KVM: arm/arm64: Demote HYP VA range display to being a debug feature Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 12/19] KVM: arm/arm64: Move ioremap calls to create_hyp_io_mappings Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 13/19] KVM: arm/arm64: Keep GICv2 HYP VAs in kvm_vgic_global_state Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 14/19] KVM: arm/arm64: Move HYP IO VAs to the "idmap" range Marc Zyngier
2017-12-20 13:16 ` Steve Capper
2017-12-26 11:03 ` Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 15/19] arm64; insn: Add encoder for the EXTR instruction Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 16/19] arm64: insn: Allow ADD/SUB (immediate) with LSL #12 Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 17/19] arm64: KVM: Dynamically compute the HYP VA mask Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 18/19] arm64: KVM: Introduce EL2 VA randomisation Marc Zyngier
2017-12-18 17:39 ` [PATCH v3 19/19] arm64: Update the KVM memory map documentation Marc Zyngier
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=20171218173926.16911-4-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=catalin.marinas@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.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: 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