diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 19:39:05 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 19:39:05 +0400 |
| commit | 6924a4672dd07dbe11d76fe597d17a092434232f (patch) | |
| tree | ab533f30241e9b4ce8bce0d4d08a37c4fffeb71e /arch/x86/include | |
| parent | ac3c1c4f1c77190408162aee559c655090597072 (diff) | |
| parent | 25aa2957973d361081ac6c8b6e5a0d9d7a83fef6 (diff) | |
| download | linux-6924a4672dd07dbe11d76fe597d17a092434232f.tar.xz | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/apic changes from Ingo Molnar:
"Smaller fixes"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/ioapic: Check attr against the previous setting when programmed more than once
x86/ioapic/kcrash: Prevent crash_kexec() from deadlocking on ioapic_lock
x86/acpi: Fix incorrect sanity check in acpi_register_lapic()
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index f8119b582c3c..1d2091a226bc 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -715,4 +715,6 @@ static inline void exiting_ack_irq(void) ack_APIC_irq(); } +extern void ioapic_zap_locks(void); + #endif /* _ASM_X86_APIC_H */ |