diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-07-17 12:09:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 12:16:31 -0400 |
commit | 2f73ccab5628b4f8e8f4b93fea8082dd31a87a10 (patch) | |
tree | 9f93510e58c993d9e5c900f5d9f464e51da562a9 | |
parent | 42fea1f385e99a1db979eb75c8a53c0baad0d9f6 (diff) |
fix build error of arch/ia64/kvm/*
Fix calls of smp_call_function*() in arch/ia64/kvm for recent API
changes.
CC [M] arch/ia64/kvm/kvm-ia64.o
arch/ia64/kvm/kvm-ia64.c: In function 'handle_global_purge':
arch/ia64/kvm/kvm-ia64.c:398: error: too many arguments to function 'smp_call_function_single'
arch/ia64/kvm/kvm-ia64.c: In function 'kvm_vcpu_kick':
arch/ia64/kvm/kvm-ia64.c:1696: error: too many arguments to function 'smp_call_function_single'
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 4 | ||||
-rw-r--r-- | arch/ia64/kvm/kvm_fw.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 318b81100623..68c978be9a51 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -395,7 +395,7 @@ static int handle_global_purge(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
395 | if (kvm->vcpus[i]->cpu != -1) { | 395 | if (kvm->vcpus[i]->cpu != -1) { |
396 | call_data.vcpu = kvm->vcpus[i]; | 396 | call_data.vcpu = kvm->vcpus[i]; |
397 | smp_call_function_single(kvm->vcpus[i]->cpu, | 397 | smp_call_function_single(kvm->vcpus[i]->cpu, |
398 | vcpu_global_purge, &call_data, 0, 1); | 398 | vcpu_global_purge, &call_data, 1); |
399 | } else | 399 | } else |
400 | printk(KERN_WARNING"kvm: Uninit vcpu received ipi!\n"); | 400 | printk(KERN_WARNING"kvm: Uninit vcpu received ipi!\n"); |
401 | 401 | ||
@@ -1693,7 +1693,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) | |||
1693 | wake_up_interruptible(&vcpu->wq); | 1693 | wake_up_interruptible(&vcpu->wq); |
1694 | 1694 | ||
1695 | if (vcpu->guest_mode) | 1695 | if (vcpu->guest_mode) |
1696 | smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0, 0); | 1696 | smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0); |
1697 | } | 1697 | } |
1698 | 1698 | ||
1699 | int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 trig) | 1699 | int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 trig) |
diff --git a/arch/ia64/kvm/kvm_fw.c b/arch/ia64/kvm/kvm_fw.c index 091f936c4485..0c69d9ec92d4 100644 --- a/arch/ia64/kvm/kvm_fw.c +++ b/arch/ia64/kvm/kvm_fw.c | |||
@@ -130,7 +130,7 @@ static struct ia64_pal_retval pal_cache_flush(struct kvm_vcpu *vcpu) | |||
130 | args.cache_type = gr29; | 130 | args.cache_type = gr29; |
131 | args.operation = gr30; | 131 | args.operation = gr30; |
132 | smp_call_function(remote_pal_cache_flush, | 132 | smp_call_function(remote_pal_cache_flush, |
133 | (void *)&args, 1, 1); | 133 | (void *)&args, 1); |
134 | if (args.status != 0) | 134 | if (args.status != 0) |
135 | printk(KERN_ERR"pal_cache_flush error!," | 135 | printk(KERN_ERR"pal_cache_flush error!," |
136 | "status:0x%lx\n", args.status); | 136 | "status:0x%lx\n", args.status); |