diff options
| author |   Marc Zyngier <maz@kernel.org> | 2019-11-08 11:27:29 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2019-11-08 11:27:29 +0000 |
| commit | cd7056ae34af0e9424da97bbc7d2b38246ba8a2c (patch) | |
| tree | eefb53f37554ebacf3a91a512839b6b6afbe75f4 /drivers | |
| parent | Merge remote-tracking branch 'kvmarm/kvm-arm64/stolen-time' into kvmarm-master/next (diff) | |
| parent | KVM: arm64: Opportunistically turn off WFI trapping when using direct LPI injection (diff) | |
Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/irqchip/irq-gic-v4.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v4.c b/drivers/irqchip/irq-gic-v4.c index 563e87ed0766..45969927cc81 100644 --- a/drivers/irqchip/irq-gic-v4.c +++ b/drivers/irqchip/irq-gic-v4.c @@ -141,12 +141,17 @@ static int its_send_vpe_cmd(struct its_vpe *vpe, struct its_cmd_info *info) int its_schedule_vpe(struct its_vpe *vpe, bool on) { struct its_cmd_info info; + int ret; WARN_ON(preemptible()); info.cmd_type = on ? SCHEDULE_VPE : DESCHEDULE_VPE; - return its_send_vpe_cmd(vpe, &info); + ret = its_send_vpe_cmd(vpe, &info); + if (!ret) + vpe->resident = on; + + return ret; } int its_invall_vpe(struct its_vpe *vpe) |