2008-07-04 12:36:27

by Takashi Iwai

Subject: [PATCH next-20080704] fix build error of arch/ia64/kvm/*

Fix calls of smp_call_function*() in arch/ia64/kvm for recent API
changes.

Signed-off-by: Takashi Iwai <[email protected]>

---
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index a4cf4a2..9408b30 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -398,7 +398,7 @@ static int handle_global_purge(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
if (kvm->vcpus[i]->cpu != -1) {
call_data.vcpu = kvm->vcpus[i];
smp_call_function_single(kvm->vcpus[i]->cpu,
- vcpu_global_purge, &call_data, 0, 1);
+ vcpu_global_purge, &call_data, 1);
} else
printk(KERN_WARNING"kvm: Uninit vcpu received ipi!\n");

@@ -1688,7 +1688,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
wake_up_interruptible(&vcpu->wq);

if (vcpu->guest_mode)
- smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0, 0);
+ smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0);
}

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 091f936..0c69d9e 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)
args.cache_type = gr29;
args.operation = gr30;
smp_call_function(remote_pal_cache_flush,
- (void *)&args, 1, 1);
+ (void *)&args, 1);
if (args.status != 0)
printk(KERN_ERR"pal_cache_flush error!,"
"status:0x%lx\n", args.status);

2008-07-05 09:43:23

by Zhang, Xiantao

Subject: RE: [PATCH next-20080704] fix build error of arch/ia64/kvm/*

Acked-by Xiantao Zhang <[email protected]>

Takashi Iwai wrote:
> Fix calls of smp_call_function*() in arch/ia64/kvm for recent API
> changes.
>
> Signed-off-by: Takashi Iwai <[email protected]>
>
> ---
> diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
> index a4cf4a2..9408b30 100644
> --- a/arch/ia64/kvm/kvm-ia64.c
> +++ b/arch/ia64/kvm/kvm-ia64.c
> @@ -398,7 +398,7 @@ static int handle_global_purge(struct kvm_vcpu
> *vcpu, struct kvm_run *kvm_run) if (kvm->vcpus[i]->cpu
!= -1) {
> call_data.vcpu = kvm->vcpus[i];
> smp_call_function_single(kvm->vcpus[i]->cpu,
> - vcpu_global_purge, &call_data,
0, 1);
> + vcpu_global_purge, &call_data,
1);
> } else
> printk(KERN_WARNING"kvm: Uninit vcpu received
ipi!\n");
>
> @@ -1688,7 +1688,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
> wake_up_interruptible(&vcpu->wq);
>
> if (vcpu->guest_mode)
> - smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu,
0, 0);
> + smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu,
0);
> }
>
> 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 091f936..0c69d9e 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) args.cache_type = gr29;
> args.operation = gr30;
> smp_call_function(remote_pal_cache_flush,
> - (void *)&args, 1, 1);
> + (void *)&args, 1);
> if (args.status != 0)
> printk(KERN_ERR"pal_cache_flush error!,"
> "status:0x%lx\n", args.status);