summaryrefslogtreecommitdiff
path: root/arch/powerpc/sysdev/xive/spapr.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-10-09 14:11:30 +0200
committerTakashi Iwai <tiwai@suse.de>2017-10-09 14:11:30 +0200
commit545633f6fecd240bfa50bb8e2db627eac76f9f8a (patch)
tree7b68d3d5d49e352c5d1eaecd5e0958db89bda09a /arch/powerpc/sysdev/xive/spapr.c
parent3a9fce327ff9cabf7f89d3f20616a83af28393da (diff)
parent5803b023881857db32ffefa0d269c90280a67ee0 (diff)
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/powerpc/sysdev/xive/spapr.c')
-rw-r--r--arch/powerpc/sysdev/xive/spapr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
index f24a70bc6855..d9c4c9366049 100644
--- a/arch/powerpc/sysdev/xive/spapr.c
+++ b/arch/powerpc/sysdev/xive/spapr.c
@@ -431,7 +431,11 @@ static int xive_spapr_get_ipi(unsigned int cpu, struct xive_cpu *xc)
static void xive_spapr_put_ipi(unsigned int cpu, struct xive_cpu *xc)
{
+ if (!xc->hw_ipi)
+ return;
+
xive_irq_bitmap_free(xc->hw_ipi);
+ xc->hw_ipi = 0;
}
#endif /* CONFIG_SMP */