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

Commit 4fe27d2a authored by Paul Mackerras's avatar Paul Mackerras Committed by Alexander Graf
Browse files

KVM: PPC: Remove unused argument to kvmppc_core_dequeue_external 



Currently kvmppc_core_dequeue_external() takes a struct kvm_interrupt *
argument and does nothing with it, in any of its implementations.
This removes it in order to make things easier for forthcoming
in-kernel interrupt controller emulation code.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 47bf3797

arch/powerpc/include/asm/kvm_ppc.h

+1 −2
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ extern void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu); 
extern void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,

                                       struct kvm_interrupt *irq);

extern void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu,

                                         struct kvm_interrupt *irq);

extern void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu);

extern void kvmppc_core_flush_tlb(struct kvm_vcpu *vcpu);



extern int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,

arch/powerpc/kvm/book3s.c

+1 −2
Original line number Diff line number Diff line
@@ -160,8 +160,7 @@ void kvmppc_core_queue_external(struct kvm_vcpu *vcpu, 
	kvmppc_book3s_queue_irqprio(vcpu, vec);

}



void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu,

                                  struct kvm_interrupt *irq)

void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu)

{

	kvmppc_book3s_dequeue_irqprio(vcpu, BOOK3S_INTERRUPT_EXTERNAL);

	kvmppc_book3s_dequeue_irqprio(vcpu, BOOK3S_INTERRUPT_EXTERNAL_LEVEL);

arch/powerpc/kvm/booke.c

+1 −2
Original line number Diff line number Diff line
@@ -222,8 +222,7 @@ void kvmppc_core_queue_external(struct kvm_vcpu *vcpu, 
	kvmppc_booke_queue_irqprio(vcpu, prio);

}



void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu,

                                  struct kvm_interrupt *irq)

void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu)

{

	clear_bit(BOOKE_IRQPRIO_EXTERNAL, &vcpu->arch.pending_exceptions);

	clear_bit(BOOKE_IRQPRIO_EXTERNAL_LEVEL, &vcpu->arch.pending_exceptions);

arch/powerpc/kvm/powerpc.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq)

{

	if (irq->irq == KVM_INTERRUPT_UNSET) {

		kvmppc_core_dequeue_external(vcpu, irq);

		kvmppc_core_dequeue_external(vcpu);

		return 0;

	}