aboutsummaryrefslogtreecommitdiff
path: root/hw/intc
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-06-16 16:42:03 +0200
committerAndreas Färber <afaerber@suse.de>2013-07-09 21:33:02 +0200
commitdfc080791dfb9dd8907a15e6d45b6cc4969b986f (patch)
treee183056d20ea0641ff561a687da2b922438f691e /hw/intc
parentdca1173c20e7e7366a9c36f88ae4234e5387ed28 (diff)
downloadqemu-dfc080791dfb9dd8907a15e6d45b6cc4969b986f.zip
qemu-dfc080791dfb9dd8907a15e6d45b6cc4969b986f.tar.gz
qemu-dfc080791dfb9dd8907a15e6d45b6cc4969b986f.tar.bz2
intc/arm_gic: Build arm_gic only once
Since current_cpu is CPUState it no longer needs CPUArchState. Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/intc')
-rw-r--r--hw/intc/Makefile.objs2
-rw-r--r--hw/intc/arm_gic.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
index 2ba49d0..e8f9267 100644
--- a/hw/intc/Makefile.objs
+++ b/hw/intc/Makefile.objs
@@ -10,9 +10,9 @@ common-obj-$(CONFIG_REALVIEW) += realview_gic.o
common-obj-$(CONFIG_SLAVIO) += slavio_intctl.o
common-obj-$(CONFIG_IOAPIC) += ioapic_common.o
common-obj-$(CONFIG_ARM_GIC) += arm_gic_common.o
+common-obj-$(CONFIG_ARM_GIC) += arm_gic.o
obj-$(CONFIG_APIC) += apic.o apic_common.o
-obj-$(CONFIG_ARM_GIC) += arm_gic.o
obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o
obj-$(CONFIG_STELLARIS) += armv7m_nvic.o
obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o exynos4210_combiner.o
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 237d1d6..8e34004 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -20,6 +20,7 @@
#include "hw/sysbus.h"
#include "gic_internal.h"
+#include "qom/cpu.h"
//#define DEBUG_GIC