[PATCH 13/21] arm: Move gicd_base declarations into header

[Jan Kiszka]

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
hypervisor/arch/arm/gic-common.c | 2 --
hypervisor/arch/arm/gic-v2.c | 1 -
hypervisor/arch/arm/gic-v3.c | 1 -
hypervisor/arch/arm/include/asm/gic.h | 2 ++
4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hypervisor/arch/arm/gic-common.c b/hypervisor/arch/arm/gic-common.c
index 695604c..fba1760 100644
--- a/hypervisor/arch/arm/gic-common.c
+++ b/hypervisor/arch/arm/gic-common.c
@@ -24,8 +24,6 @@
#define REG_RANGE(base, n, size) \
(base) ... ((base) + (n - 1) * (size))

-extern void *gicd_base;
-
static DEFINE_SPINLOCK(dist_lock);

/* The GIC interface numbering does not necessarily match the logical map */
diff --git a/hypervisor/arch/arm/gic-v2.c b/hypervisor/arch/arm/gic-v2.c
index 913e05c..f184cb0 100644
--- a/hypervisor/arch/arm/gic-v2.c
+++ b/hypervisor/arch/arm/gic-v2.c
@@ -18,7 +18,6 @@

static unsigned int gic_num_lr;

-extern void *gicd_base;
void *gicc_base;
void *gich_base;

diff --git a/hypervisor/arch/arm/gic-v3.c b/hypervisor/arch/arm/gic-v3.c
index 1ae6530..f73f40c 100644
--- a/hypervisor/arch/arm/gic-v3.c
+++ b/hypervisor/arch/arm/gic-v3.c
@@ -32,7 +32,6 @@ static unsigned int gic_num_lr;
static unsigned int gic_num_priority_bits;
static u32 gic_version;

-extern void *gicd_base;
static void *gicr_base;

static int gic_init(void)
diff --git a/hypervisor/arch/arm/include/asm/gic.h b/hypervisor/arch/arm/include/asm/gic.h
index d251c9a..5d385bb 100644
--- a/hypervisor/arch/arm/include/asm/gic.h
+++ b/hypervisor/arch/arm/include/asm/gic.h
@@ -56,6 +56,8 @@ struct sgi;

extern u8 target_cpu_map[];

+extern void *gicd_base;
+
int gic_probe_cpu_id(unsigned int cpu);
enum mmio_result gic_handle_dist_access(void *arg, struct mmio_access *mmio);
enum mmio_result gic_handle_irq_route(struct mmio_access *mmio,
--
2.1.4