diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-22 16:25:18 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-22 16:25:18 -0800 |
| commit | 54b56170e4517e9606b245c3f805fc96baa059f0 (patch) | |
| tree | 9f8750ef972b4a7fdce530889dcbaf2a8b5b0d05 /arch/x86/include/asm/i8259.h | |
| parent | 1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88 (diff) | |
| parent | d02e30c31c57683a66ed68a1bcff900ca78f6d56 (diff) | |
Merge remote branch 'origin/x86/apic' into x86/mrst
Conflicts:
arch/x86/kernel/apic/io_apic.c
Diffstat (limited to 'arch/x86/include/asm/i8259.h')
| -rw-r--r-- | arch/x86/include/asm/i8259.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h index 2832babd91f..1655147646a 100644 --- a/arch/x86/include/asm/i8259.h +++ b/arch/x86/include/asm/i8259.h @@ -24,7 +24,7 @@ extern unsigned int cached_irq_mask; #define SLAVE_ICW4_DEFAULT 0x01 #define PIC_ICW4_AEOI 2 -extern spinlock_t i8259A_lock; +extern raw_spinlock_t i8259A_lock; /* the PIC may need a careful delay on some platforms, hence specific calls */ static inline unsigned char inb_pic(unsigned int port) |