diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:46:10 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:46:10 -0800 |
| commit | 52f3a41e0aca5625fbd118ed57a4debb25817e99 (patch) | |
| tree | 86730c862fc97eef5f1eb1a81bf74bf2a8a36754 /arch/powerpc/sysdev/xics/xics-common.c | |
| parent | e9b7086b80c4d9e354f4edc9e280ae85a60df408 (diff) | |
| parent | 8770b07c2dff3cec2c751b289ee690137c88ea54 (diff) | |
Merge branch 'fixes-v3.2-rc2' into fixes
Diffstat (limited to 'arch/powerpc/sysdev/xics/xics-common.c')
| -rw-r--r-- | arch/powerpc/sysdev/xics/xics-common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c index 3d93a8ded0f..63762c672a0 100644 --- a/arch/powerpc/sysdev/xics/xics-common.c +++ b/arch/powerpc/sysdev/xics/xics-common.c @@ -134,11 +134,10 @@ static void xics_request_ipi(void) BUG_ON(ipi == NO_IRQ); /* - * IPIs are marked IRQF_DISABLED as they must run with irqs - * disabled, and PERCPU. The handler was set in map. + * IPIs are marked IRQF_PERCPU. The handler was set in map. */ BUG_ON(request_irq(ipi, icp_ops->ipi_action, - IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL)); + IRQF_PERCPU, "IPI", NULL)); } int __init xics_smp_probe(void) |