diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:53:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:53:57 +0200 |
| commit | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (patch) | |
| tree | 9ae9b4c4545b4c91f5dbb3a1085c4c721961c4f2 /include/asm-x86/genapic_64.h | |
| parent | 58cf35228fec541418cc3bd781d6c069d904815e (diff) | |
| parent | cbd6712406a3ea861b49fbfd46e23cbf5f8e073f (diff) | |
Merge branch 'x86/irq' into x86/devel
Conflicts:
arch/x86/kernel/i8259.c
arch/x86/kernel/irqinit_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/genapic_64.h')
| -rw-r--r-- | include/asm-x86/genapic_64.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/genapic_64.h b/include/asm-x86/genapic_64.h index 1de931b263c..0f8504627c4 100644 --- a/include/asm-x86/genapic_64.h +++ b/include/asm-x86/genapic_64.h @@ -44,4 +44,6 @@ DECLARE_PER_CPU(int, x2apic_extra_bits); extern void uv_cpu_init(void); extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip); +extern void setup_apic_routing(void); + #endif |