diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-18 13:33:15 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-18 13:33:15 +1000 |
commit | 2854a11e7f83dd99c89d2261508c80358cf18183 (patch) | |
tree | 1c86cc6921357134e188f4a9cac1b65906607352 /arch/x86/include/asm | |
parent | ad5157a45d59fb08514976209d87dae5ac1bb7e1 (diff) | |
parent | 522474ad8130cb802912d2d3e72d19fab55b50a0 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index cb6cfcd034cf..a80cbb88ea91 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -43,7 +43,7 @@ extern int vector_used_by_percpu_irq(unsigned int vector); extern void init_ISA_irqs(void); #ifdef CONFIG_X86_LOCAL_APIC -void arch_trigger_all_cpu_backtrace(void); +void arch_trigger_all_cpu_backtrace(bool); #define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace #endif |