aboutsummaryrefslogtreecommitdiff
path: root/virt/kvm/ioapic.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-11 00:38:34 +0100
committerMark Brown <broonie@kernel.org>2014-10-11 11:28:22 +0100
commitaea5b31b7df7526dcb07000a50d35f3df3e6c283 (patch)
treec5f02bbdfac69a0165a3f366dc8f1a85ed459d3f /virt/kvm/ioapic.c
parent1ab056a5fb0d123436b862806734c6a9dc4651a4 (diff)
parent2606d2448703e8995ca39a59d8a1106a1e0f034a (diff)
downloadlinux-linaro-stable-aea5b31b7df7526dcb07000a50d35f3df3e6c283.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/kvm' into linux-linaro-lsk
Conflicts: arch/arm/kvm/arm.c arch/arm64/Makefile arch/arm64/kernel/asm-offsets.c virt/kvm/kvm_main.c
Diffstat (limited to 'virt/kvm/ioapic.c')
-rw-r--r--virt/kvm/ioapic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 5eaf18f90e83..b47541dd798f 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -519,7 +519,7 @@ static int ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
return 0;
}
-void kvm_ioapic_reset(struct kvm_ioapic *ioapic)
+static void kvm_ioapic_reset(struct kvm_ioapic *ioapic)
{
int i;