diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-21 06:51:42 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-21 07:54:05 +0100 |
| commit | aef55d4922e62a0d887e60d87319f3718aec6ced (patch) | |
| tree | e81bdf46d49fa3421747b2b2074aaeae3aee890b /arch/x86/kernel/smpboot.c | |
| parent | xen: Remove unnecessary arch specific xen irq functions. (diff) | |
| parent | x86, irq: Keep chip_data in create_irq_nr and destroy_irq (diff) | |
| download | linux-aef55d4922e62a0d887e60d87319f3718aec6ced.tar.xz linux-aef55d4922e62a0d887e60d87319f3718aec6ced.zip | |
Merge branch 'x86/urgent' into x86/irq
Merge reason: conflict in arch/x86/kernel/apic/io_apic.c
Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index eff2fe175422..96f5f40a5c29 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1083,9 +1083,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) set_cpu_sibling_map(0); enable_IR_x2apic(); -#ifdef CONFIG_X86_64 default_setup_apic_routing(); -#endif if (smp_sanity_check(max_cpus) < 0) { printk(KERN_INFO "SMP disabled\n"); |