Message ID | 1467699155-19108-2-git-send-email-andrew.donnellan@au1.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Tue, 2016-05-07 at 06:12:34 UTC, Andrew Donnellan wrote:
> Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/fa2cff3f54cfec5c0b83afdb4f
cheers
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 3cb46a3..58217ae 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -250,7 +250,7 @@ notrace void arch_local_irq_restore(unsigned long en) if (WARN_ON(mfmsr() & MSR_EE)) __hard_irq_disable(); } -#endif /* CONFIG_TRACE_IRQFLAG */ +#endif /* CONFIG_TRACE_IRQFLAGS */ set_soft_enabled(0);
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> --- arch/powerpc/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)