diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 01:50:31 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 01:50:31 +0300 |
commit | 69f658e399f3d9cb9c9680afb714ba23860d7ccb (patch) | |
tree | 13fbc42f466cb10d319514e4ddec53def8c554f6 /arch/powerpc/sysdev/xive/spapr.c | |
parent | 9867999f3a85b52f96ef05fca00cc8128eed01ce (diff) | |
parent | 42f6284ae602469762ee721ec31ddfc6170e00bc (diff) | |
download | linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.tar.xz |
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'arch/powerpc/sysdev/xive/spapr.c')
-rw-r--r-- | arch/powerpc/sysdev/xive/spapr.c | 4 |
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 */ |