[patch] KVM/ia64 update to new smp_call_function API

[patch] KVM/ia64 update to new smp_call_function API

[Jes Sorensen]

[-- Attachment #1: Type: text/plain, Size: 65 bytes --]

Hi,

This one makes KVM/ia64 build and boot again.

Cheers,
Jes


[-- Attachment #2: ia64-fix-kvm-smp-call.diff --]
[-- Type: text/plain, Size: 1597 bytes --]

Convert KVM/ia64 to use the updated smp_call_function api, removing
the restart parameter.

Signed-off-by: Jes Sorensen <jes@sgi.com>

---
 arch/ia64/kvm/kvm-ia64.c |    4 ++--
 arch/ia64/kvm/kvm_fw.c   |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

Index: linux-2.6.git/arch/ia64/kvm/kvm-ia64.c
===================================================================
--- linux-2.6.git.orig/arch/ia64/kvm/kvm-ia64.c
+++ linux-2.6.git/arch/ia64/kvm/kvm-ia64.c
@@ -395,7 +395,7 @@
 		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");
 
@@ -1693,7 +1693,7 @@
 		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)
Index: linux-2.6.git/arch/ia64/kvm/kvm_fw.c
===================================================================
--- linux-2.6.git.orig/arch/ia64/kvm/kvm_fw.c
+++ linux-2.6.git/arch/ia64/kvm/kvm_fw.c
@@ -129,8 +129,7 @@
 	gr30 &= ~PAL_CACHE_FLUSH_CHK_INTRS;
 	args.cache_type = gr29;
 	args.operation = gr30;
-	smp_call_function(remote_pal_cache_flush,
-				(void *)&args, 1, 1);
+	smp_call_function(remote_pal_cache_flush, (void *)&args, 1);
 	if (args.status != 0)
 		printk(KERN_ERR"pal_cache_flush error!,"
 				"status:0x%lx\n", args.status);

[patch] KVM/ia64 update to new smp_call_function API

[Jes Sorensen]

[-- Attachment #1: Type: text/plain, Size: 65 bytes --]

Hi,

This one makes KVM/ia64 build and boot again.

Cheers,
Jes


[-- Attachment #2: ia64-fix-kvm-smp-call.diff --]
[-- Type: text/plain, Size: 1597 bytes --]

Convert KVM/ia64 to use the updated smp_call_function api, removing
the restart parameter.

Signed-off-by: Jes Sorensen <jes@sgi.com>

---
 arch/ia64/kvm/kvm-ia64.c |    4 ++--
 arch/ia64/kvm/kvm_fw.c   |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

Index: linux-2.6.git/arch/ia64/kvm/kvm-ia64.c
===================================================================
--- linux-2.6.git.orig/arch/ia64/kvm/kvm-ia64.c
+++ linux-2.6.git/arch/ia64/kvm/kvm-ia64.c
@@ -395,7 +395,7 @@
 		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");
 
@@ -1693,7 +1693,7 @@
 		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)
Index: linux-2.6.git/arch/ia64/kvm/kvm_fw.c
===================================================================
--- linux-2.6.git.orig/arch/ia64/kvm/kvm_fw.c
+++ linux-2.6.git/arch/ia64/kvm/kvm_fw.c
@@ -129,8 +129,7 @@
 	gr30 &= ~PAL_CACHE_FLUSH_CHK_INTRS;
 	args.cache_type = gr29;
 	args.operation = gr30;
-	smp_call_function(remote_pal_cache_flush,
-				(void *)&args, 1, 1);
+	smp_call_function(remote_pal_cache_flush, (void *)&args, 1);
 	if (args.status != 0)
 		printk(KERN_ERR"pal_cache_flush error!,"
 				"status:0x%lx\n", args.status);