diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:26:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:04 -0400 |
| commit | 4cedb3343f0b087275b9a8e23fc90737881ac91c (patch) | |
| tree | fe52c420466938a5b5ecc22e90289c73db9d33ac /arch/x86/kernel/smpboot.c | |
| parent | acbb67341805d3b9ef263d8cbd103a6054164491 (diff) | |
x86: remove smpboot_32.c and smpboot_64.c
Remove the last leftovers from the files. Move the ones
that are still used to the files they belong, the others
that grep can't reach, simply throw away.
Merge comments ontop of file and that's it: smpboot integrated
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 75637fb760e7..61b9a5b6fc07 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -1,3 +1,44 @@ | |||
| 1 | /* | ||
| 2 | * x86 SMP booting functions | ||
| 3 | * | ||
| 4 | * (c) 1995 Alan Cox, Building #3 <alan@redhat.com> | ||
| 5 | * (c) 1998, 1999, 2000 Ingo Molnar <mingo@redhat.com> | ||
| 6 | * Copyright 2001 Andi Kleen, SuSE Labs. | ||
| 7 | * | ||
| 8 | * Much of the core SMP work is based on previous work by Thomas Radke, to | ||
| 9 | * whom a great many thanks are extended. | ||
| 10 | * | ||
| 11 | * Thanks to Intel for making available several different Pentium, | ||
| 12 | * Pentium Pro and Pentium-II/Xeon MP machines. | ||
| 13 | * Original development of Linux SMP code supported by Caldera. | ||
| 14 | * | ||
| 15 | * This code is released under the GNU General Public License version 2 or | ||
| 16 | * later. | ||
| 17 | * | ||
| 18 | * Fixes | ||
| 19 | * Felix Koop : NR_CPUS used properly | ||
| 20 | * Jose Renau : Handle single CPU case. | ||
| 21 | * Alan Cox : By repeated request 8) - Total BogoMIPS report. | ||
| 22 | * Greg Wright : Fix for kernel stacks panic. | ||
| 23 | * Erich Boleyn : MP v1.4 and additional changes. | ||
| 24 | * Matthias Sattler : Changes for 2.1 kernel map. | ||
| 25 | * Michel Lespinasse : Changes for 2.1 kernel map. | ||
| 26 | * Michael Chastain : Change trampoline.S to gnu as. | ||
| 27 | * Alan Cox : Dumb bug: 'B' step PPro's are fine | ||
| 28 | * Ingo Molnar : Added APIC timers, based on code | ||
| 29 | * from Jose Renau | ||
| 30 | * Ingo Molnar : various cleanups and rewrites | ||
| 31 | * Tigran Aivazian : fixed "0.00 in /proc/uptime on SMP" bug. | ||
| 32 | * Maciej W. Rozycki : Bits for genuine 82489DX APICs | ||
| 33 | * Andi Kleen : Changed for SMP boot into long mode. | ||
| 34 | * Martin J. Bligh : Added support for multi-quad systems | ||
| 35 | * Dave Jones : Report invalid combinations of Athlon CPUs. | ||
| 36 | * Rusty Russell : Hacked into shape for new "hotplug" boot process. | ||
| 37 | * Andi Kleen : Converted to new state machine. | ||
| 38 | * Ashok Raj : CPU hotplug support | ||
| 39 | * Glauber Costa : i386 and x86_64 integration | ||
| 40 | */ | ||
| 41 | |||
| 1 | #include <linux/init.h> | 42 | #include <linux/init.h> |
| 2 | #include <linux/smp.h> | 43 | #include <linux/smp.h> |
| 3 | #include <linux/module.h> | 44 | #include <linux/module.h> |
| @@ -44,6 +85,7 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata | |||
| 44 | void *x86_bios_cpu_apicid_early_ptr; | 85 | void *x86_bios_cpu_apicid_early_ptr; |
| 45 | DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID; | 86 | DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID; |
| 46 | EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid); | 87 | EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid); |
| 88 | u8 apicid_2_node[MAX_APICID]; | ||
| 47 | #endif | 89 | #endif |
| 48 | 90 | ||
| 49 | /* State of each CPU */ | 91 | /* State of each CPU */ |