diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 17:08:35 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 17:08:35 +0200 |
commit | 80c1834fc86c2bbacb54a8fc3c04a8b0066b0996 (patch) | |
tree | 8200248706960af8b779e9144f5b51c670602228 /arch/powerpc/kernel/irq.c | |
parent | irq_domain: correct a minor wrong comment for linear revmap (diff) | |
parent | Linux 3.5-rc6 (diff) | |
download | linux-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.tar.xz linux-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.zip |
Merge tag 'v3.5-rc6' into irqdomain/next
Linux 3.5-rc6
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r-- | arch/powerpc/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 7835a5e1ea5f..1b415027ec0e 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -277,7 +277,7 @@ EXPORT_SYMBOL(arch_local_irq_restore); * NOTE: This is called with interrupts hard disabled but not marked * as such in paca->irq_happened, so we need to resync this. */ -void restore_interrupts(void) +void notrace restore_interrupts(void) { if (irqs_disabled()) { local_paca->irq_happened |= PACA_IRQ_HARD_DIS; |