On 14 July 2015 at 11:17, Graeme Gregory graeme.gregory@linaro.org wrote:
This just leads to compile errors so stub the _probe function in the CONFIG_ACPI=n case.
Signed-off-by: Graeme Gregory graeme.gregory@linaro.org
virt/kvm/arm/vgic-v2.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/virt/kvm/arm/vgic-v2.c b/virt/kvm/arm/vgic-v2.c index 5ba2ea6..5d75118 100644 --- a/virt/kvm/arm/vgic-v2.c +++ b/virt/kvm/arm/vgic-v2.c @@ -27,7 +27,7 @@
#include <linux/irqchip/arm-gic.h>
-#include <asm/acpi.h> +//#include <asm/acpi.h>
Ignore this, I forgot to remove it before committing!
Graeme
#include <asm/kvm_emulate.h> #include <asm/kvm_arm.h> #include <asm/kvm_mmu.h> @@ -260,6 +260,7 @@ out: return ret; }
+#ifdef CONFIG_ACPI struct acpi_madt_generic_interrupt *vgic_acpi; static void gic_get_acpi_header(struct acpi_subtable_header *header) { @@ -329,3 +330,11 @@ int vgic_v2_acpi_probe(const struct vgic_ops **ops, out: return ret; } +#else +int vgic_v2_acpi_probe(const struct vgic_ops **ops,
const struct vgic_params **params)+{
return -ENOSYS;+} +#endif
-- 2.1.4