Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cedb334 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

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: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent acbb6734

arch/x86/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ obj-$(CONFIG_MICROCODE) += microcode.o 
obj-$(CONFIG_PCI)		+= early-quirks.o

apm-y				:= apm_32.o

obj-$(CONFIG_APM)		+= apm.o

obj-$(CONFIG_X86_SMP)		+= smpboot_$(BITS).o smp.o

obj-$(CONFIG_X86_SMP)		+= smp.o

obj-$(CONFIG_X86_SMP)		+= smpboot.o tsc_sync.o ipi.o tlb_$(BITS).o

obj-$(CONFIG_X86_32_SMP)	+= smpcommon.o

obj-$(CONFIG_X86_64_SMP)	+= smpboot_64.o tsc_sync.o smpcommon.o

obj-$(CONFIG_X86_64_SMP)	+= tsc_sync.o smpcommon.o

obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline_$(BITS).o

obj-$(CONFIG_X86_MPPARSE)	+= mpparse_$(BITS).o

obj-$(CONFIG_X86_LOCAL_APIC)	+= apic_$(BITS).o nmi_$(BITS).o

arch/x86/kernel/smpboot.c

+42 −0
Original line number Diff line number Diff line 
/*

 *	x86 SMP booting functions

 *

 *	(c) 1995 Alan Cox, Building #3 <alan@redhat.com>

 *	(c) 1998, 1999, 2000 Ingo Molnar <mingo@redhat.com>

 *	Copyright 2001 Andi Kleen, SuSE Labs.

 *

 *	Much of the core SMP work is based on previous work by Thomas Radke, to

 *	whom a great many thanks are extended.

 *

 *	Thanks to Intel for making available several different Pentium,

 *	Pentium Pro and Pentium-II/Xeon MP machines.

 *	Original development of Linux SMP code supported by Caldera.

 *

 *	This code is released under the GNU General Public License version 2 or

 *	later.

 *

 *	Fixes

 *		Felix Koop	:	NR_CPUS used properly

 *		Jose Renau	:	Handle single CPU case.

 *		Alan Cox	:	By repeated request 8) - Total BogoMIPS report.

 *		Greg Wright	:	Fix for kernel stacks panic.

 *		Erich Boleyn	:	MP v1.4 and additional changes.

 *	Matthias Sattler	:	Changes for 2.1 kernel map.

 *	Michel Lespinasse	:	Changes for 2.1 kernel map.

 *	Michael Chastain	:	Change trampoline.S to gnu as.

 *		Alan Cox	:	Dumb bug: 'B' step PPro's are fine

 *		Ingo Molnar	:	Added APIC timers, based on code

 *					from Jose Renau

 *		Ingo Molnar	:	various cleanups and rewrites

 *		Tigran Aivazian	:	fixed "0.00 in /proc/uptime on SMP" bug.

 *	Maciej W. Rozycki	:	Bits for genuine 82489DX APICs

 *	Andi Kleen		:	Changed for SMP boot into long mode.

 *		Martin J. Bligh	: 	Added support for multi-quad systems

 *		Dave Jones	:	Report invalid combinations of Athlon CPUs.

 *		Rusty Russell	:	Hacked into shape for new "hotplug" boot process.

 *      Andi Kleen              :       Converted to new state machine.

 *	Ashok Raj		: 	CPU hotplug support

 *	Glauber Costa		:	i386 and x86_64 integration

 */



#include <linux/init.h>

#include <linux/smp.h>

#include <linux/module.h>
@@ -44,6 +85,7 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata 
void *x86_bios_cpu_apicid_early_ptr;

DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;

EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);

u8 apicid_2_node[MAX_APICID];

#endif



/* State of each CPU */

arch/x86/kernel/smpboot_32.c

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
/*

 *	x86 SMP booting functions

 *

 *	(c) 1995 Alan Cox, Building #3 <alan@redhat.com>

 *	(c) 1998, 1999, 2000 Ingo Molnar <mingo@redhat.com>

 *

 *	Much of the core SMP work is based on previous work by Thomas Radke, to

 *	whom a great many thanks are extended.

 *

 *	Thanks to Intel for making available several different Pentium,

 *	Pentium Pro and Pentium-II/Xeon MP machines.

 *	Original development of Linux SMP code supported by Caldera.

 *

 *	This code is released under the GNU General Public License version 2 or

 *	later.

 *

 *	Fixes

 *		Felix Koop	:	NR_CPUS used properly

 *		Jose Renau	:	Handle single CPU case.

 *		Alan Cox	:	By repeated request 8) - Total BogoMIPS report.

 *		Greg Wright	:	Fix for kernel stacks panic.

 *		Erich Boleyn	:	MP v1.4 and additional changes.

 *	Matthias Sattler	:	Changes for 2.1 kernel map.

 *	Michel Lespinasse	:	Changes for 2.1 kernel map.

 *	Michael Chastain	:	Change trampoline.S to gnu as.

 *		Alan Cox	:	Dumb bug: 'B' step PPro's are fine

 *		Ingo Molnar	:	Added APIC timers, based on code

 *					from Jose Renau

 *		Ingo Molnar	:	various cleanups and rewrites

 *		Tigran Aivazian	:	fixed "0.00 in /proc/uptime on SMP" bug.

 *	Maciej W. Rozycki	:	Bits for genuine 82489DX APICs

 *		Martin J. Bligh	: 	Added support for multi-quad systems

 *		Dave Jones	:	Report invalid combinations of Athlon CPUs.

*		Rusty Russell	:	Hacked into shape for new "hotplug" boot process. */



#include <linux/module.h>

#include <linux/init.h>

#include <linux/kernel.h>



#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/kernel_stat.h>

#include <linux/bootmem.h>

#include <linux/notifier.h>

#include <linux/cpu.h>

#include <linux/percpu.h>

#include <linux/nmi.h>



#include <linux/delay.h>

#include <linux/mc146818rtc.h>

#include <asm/tlbflush.h>

#include <asm/desc.h>

#include <asm/arch_hooks.h>

#include <asm/nmi.h>



#include <mach_apic.h>

#include <mach_wakecpu.h>

#include <smpboot_hooks.h>

#include <asm/vmi.h>

#include <asm/mtrr.h>



u8 apicid_2_node[MAX_APICID];



/* Where the IO area was mapped on multiquad, always 0 otherwise */

void *xquad_portio;

#ifdef CONFIG_X86_NUMAQ

EXPORT_SYMBOL(xquad_portio);

#endif

arch/x86/kernel/smpboot_64.c

deleted100644 → 0
+0 −73
Original line number Diff line number Diff line 
/*

 *	x86 SMP booting functions

 *

 *	(c) 1995 Alan Cox, Building #3 <alan@redhat.com>

 *	(c) 1998, 1999, 2000 Ingo Molnar <mingo@redhat.com>

 *	Copyright 2001 Andi Kleen, SuSE Labs.

 *

 *	Much of the core SMP work is based on previous work by Thomas Radke, to

 *	whom a great many thanks are extended.

 *

 *	Thanks to Intel for making available several different Pentium,

 *	Pentium Pro and Pentium-II/Xeon MP machines.

 *	Original development of Linux SMP code supported by Caldera.

 *

 *	This code is released under the GNU General Public License version 2

 *

 *	Fixes

 *		Felix Koop	:	NR_CPUS used properly

 *		Jose Renau	:	Handle single CPU case.

 *		Alan Cox	:	By repeated request 8) - Total BogoMIP report.

 *		Greg Wright	:	Fix for kernel stacks panic.

 *		Erich Boleyn	:	MP v1.4 and additional changes.

 *	Matthias Sattler	:	Changes for 2.1 kernel map.

 *	Michel Lespinasse	:	Changes for 2.1 kernel map.

 *	Michael Chastain	:	Change trampoline.S to gnu as.

 *		Alan Cox	:	Dumb bug: 'B' step PPro's are fine

 *		Ingo Molnar	:	Added APIC timers, based on code

 *					from Jose Renau

 *		Ingo Molnar	:	various cleanups and rewrites

 *		Tigran Aivazian	:	fixed "0.00 in /proc/uptime on SMP" bug.

 *	Maciej W. Rozycki	:	Bits for genuine 82489DX APICs

 *	Andi Kleen		:	Changed for SMP boot into long mode.

 *		Rusty Russell	:	Hacked into shape for new "hotplug" boot process.

 *      Andi Kleen              :       Converted to new state machine.

 *					Various cleanups.

 *					Probably mostly hotplug CPU ready now.

 *	Ashok Raj			: CPU hotplug support

 */





#include <linux/init.h>



#include <linux/mm.h>

#include <linux/kernel_stat.h>

#include <linux/bootmem.h>

#include <linux/thread_info.h>

#include <linux/module.h>

#include <linux/delay.h>

#include <linux/mc146818rtc.h>

#include <linux/smp.h>

#include <linux/kdebug.h>



#include <asm/acpi.h>

#include <asm/mtrr.h>

#include <asm/pgalloc.h>

#include <asm/desc.h>

#include <asm/tlbflush.h>

#include <asm/proto.h>

#include <asm/nmi.h>

#include <asm/irq.h>

#include <asm/hw_irq.h>

#include <asm/numa.h>



#include <mach_wakecpu.h>

#include <mach_apic.h>

#include <smpboot_hooks.h>

#include <mach_apic.h>



/* Set when the idlers are all forked */

int smp_threads_ready;



cycles_t cacheflush_time;

unsigned long cache_decay_ticks;

arch/x86/pci/numa.c

+6 −1
Original line number Diff line number Diff line
@@ -20,7 +20,12 @@ int mp_bus_id_to_local[MAX_MP_BUSSES]; 
int quad_local_to_mp_bus_id [NR_CPUS/4][4];

#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])



extern void *xquad_portio;    /* Where the IO area was mapped */

/* Where the IO area was mapped on multiquad, always 0 otherwise */

void *xquad_portio;

#ifdef CONFIG_X86_NUMAQ

EXPORT_SYMBOL(xquad_portio);

#endif



#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)



#define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \