linux/arch/x86/kernel/smpboot_64.c, branch master

x86: remove smpboot_32.c and smpboot_64.c

2008-04-17T15:41:04Z

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 Signed-off-by: Ingo Molnar

x86: merge native_smp_prepare_cpus

2008-04-17T15:41:04Z

With the previous changes, code for native_smp_prepare_cpus() in i386 and x86_64 now look very similar. merge them into smpboot.c. Minor differences are inside ifdef Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar

x86: introduce smpboot_clear_io_apic

2008-04-17T15:41:04Z

x86_64 has two nr_ioapics = 0 statements. In 32-bit, it can be done too. We do it through the smpboot_clear_io_apic() inline function, to cope with subarchitectures (visws) that does not compile mpparse in Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar

x86: change x86_64 sanity checks to match i386.

2008-04-17T15:41:04Z

They are mostly inocuous. APIC_INTEGRATED will expand to 1, check_phys_apicid_present is checking for the same thing it was before, etc. But the code is identical to i386 now, and will allow us to integrate it. Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar

x86: change x86_64 native_smp_prepare_cpus to match i386

2008-04-17T15:41:04Z

An APIC test is moved, and code is replaced by the mach-default already defined function (smpboot_setup_io_apic). setup_portio_remap() is added, but it is a nop in mach-default. Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar

x86: merge native_smp_cpus_done

2008-04-17T15:41:04Z

They look similar enough, and are merged. Only difference (zap_low_mapping for i386) is inside ifdef Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar

x86: merge smp_prepare_boot_cpu

2008-04-17T15:41:03Z

it is practically the same between arches now, so it is moved to smpboot.c. Minor differences (gdt initialization) live inside an ifdef Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar

x86: integrate start_secondary

2008-04-17T15:41:03Z

It now looks the same between architectures, so we merge it in smpboot.c. Minor differences goes inside an ifdef Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar

x86: integrate do_boot_cpu

2008-04-17T15:41:03Z

This is a very large patch, because it depends on a lot of auxiliary static functions. But they all have been modified to the point that they're sufficiently close now. So they're just merged in smpboot.c Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar

x86: change boot_cpu_id to boot_cpu_physical_apicid

2008-04-17T15:41:02Z

This is to match i386. The former name was cuter, but the current is more meaningful and more general, since cpu_id can be a logical id. Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar