Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f73ccab authored by Takashi Iwai's avatar Takashi Iwai Committed by Linus Torvalds
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 42fea1f3

arch/ia64/kvm/kvm-ia64.c

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,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");
@@ -1693,7 +1693,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)

arch/ia64/kvm/kvm_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -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);