diff options
Diffstat (limited to 'arch/powerpc/kvm/book3s_xive.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_xive.c | 5 | 
1 files changed, 2 insertions, 3 deletions
| diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c index 13304622ab1c..bf457843e032 100644 --- a/arch/powerpc/kvm/book3s_xive.c +++ b/arch/powerpc/kvm/book3s_xive.c @@ -622,7 +622,7 @@ int kvmppc_xive_get_xive(struct kvm *kvm, u32 irq, u32 *server,  		return -EINVAL;  	state = &sb->irq_state[idx];  	arch_spin_lock(&sb->lock); -	*server = state->guest_server; +	*server = state->act_server;  	*priority = state->guest_priority;  	arch_spin_unlock(&sb->lock); @@ -1331,7 +1331,7 @@ static int xive_get_source(struct kvmppc_xive *xive, long irq, u64 addr)  	xive->saved_src_count++;  	/* Convert saved state into something compatible with xics */ -	val = state->guest_server; +	val = state->act_server;  	prio = state->saved_scan_prio;  	if (prio == MASKED) { @@ -1507,7 +1507,6 @@ static int xive_set_source(struct kvmppc_xive *xive, long irq, u64 addr)  	/* First convert prio and mark interrupt as untargetted */  	act_prio = xive_prio_from_guest(guest_prio);  	state->act_priority = MASKED; -	state->guest_server = server;  	/*  	 * We need to drop the lock due to the mutex below. Hopefully |