diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-x86/hw_irq.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'include/asm-x86/hw_irq.h')
| -rw-r--r-- | include/asm-x86/hw_irq.h | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h index edd0b95f14d0..50f6e0316b50 100644 --- a/include/asm-x86/hw_irq.h +++ b/include/asm-x86/hw_irq.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_HW_IRQ_H | 1 | #ifndef ASM_X86__HW_IRQ_H |
| 2 | #define _ASM_HW_IRQ_H | 2 | #define ASM_X86__HW_IRQ_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar | 5 | * (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar |
| @@ -64,7 +64,6 @@ extern unsigned long io_apic_irqs; | |||
| 64 | extern void init_VISWS_APIC_irqs(void); | 64 | extern void init_VISWS_APIC_irqs(void); |
| 65 | extern void setup_IO_APIC(void); | 65 | extern void setup_IO_APIC(void); |
| 66 | extern void disable_IO_APIC(void); | 66 | extern void disable_IO_APIC(void); |
| 67 | extern void print_IO_APIC(void); | ||
| 68 | extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn); | 67 | extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn); |
| 69 | extern void setup_ioapic_dest(void); | 68 | extern void setup_ioapic_dest(void); |
| 70 | 69 | ||
| @@ -73,7 +72,9 @@ extern void enable_IO_APIC(void); | |||
| 73 | #endif | 72 | #endif |
| 74 | 73 | ||
| 75 | /* IPI functions */ | 74 | /* IPI functions */ |
| 75 | #ifdef CONFIG_X86_32 | ||
| 76 | extern void send_IPI_self(int vector); | 76 | extern void send_IPI_self(int vector); |
| 77 | #endif | ||
| 77 | extern void send_IPI(int dest, int vector); | 78 | extern void send_IPI(int dest, int vector); |
| 78 | 79 | ||
| 79 | /* Statistics */ | 80 | /* Statistics */ |
| @@ -93,6 +94,26 @@ extern asmlinkage void qic_reschedule_interrupt(void); | |||
| 93 | extern asmlinkage void qic_enable_irq_interrupt(void); | 94 | extern asmlinkage void qic_enable_irq_interrupt(void); |
| 94 | extern asmlinkage void qic_call_function_interrupt(void); | 95 | extern asmlinkage void qic_call_function_interrupt(void); |
| 95 | 96 | ||
| 97 | /* SMP */ | ||
| 98 | extern void smp_apic_timer_interrupt(struct pt_regs *); | ||
| 99 | #ifdef CONFIG_X86_32 | ||
| 100 | extern void smp_spurious_interrupt(struct pt_regs *); | ||
| 101 | extern void smp_error_interrupt(struct pt_regs *); | ||
| 102 | #else | ||
| 103 | extern asmlinkage void smp_spurious_interrupt(void); | ||
| 104 | extern asmlinkage void smp_error_interrupt(void); | ||
| 105 | #endif | ||
| 106 | #ifdef CONFIG_X86_SMP | ||
| 107 | extern void smp_reschedule_interrupt(struct pt_regs *); | ||
| 108 | extern void smp_call_function_interrupt(struct pt_regs *); | ||
| 109 | extern void smp_call_function_single_interrupt(struct pt_regs *); | ||
| 110 | #ifdef CONFIG_X86_32 | ||
| 111 | extern void smp_invalidate_interrupt(struct pt_regs *); | ||
| 112 | #else | ||
| 113 | extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *); | ||
| 114 | #endif | ||
| 115 | #endif | ||
| 116 | |||
| 96 | #ifdef CONFIG_X86_32 | 117 | #ifdef CONFIG_X86_32 |
| 97 | extern void (*const interrupt[NR_IRQS])(void); | 118 | extern void (*const interrupt[NR_IRQS])(void); |
| 98 | #else | 119 | #else |
| @@ -112,4 +133,4 @@ static inline void __setup_vector_irq(int cpu) {} | |||
| 112 | 133 | ||
| 113 | #endif /* !ASSEMBLY_ */ | 134 | #endif /* !ASSEMBLY_ */ |
| 114 | 135 | ||
| 115 | #endif | 136 | #endif /* ASM_X86__HW_IRQ_H */ |