Commit edf66a3c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Ingo Molnar
Browse files

x86/cpu: Move leftover contents of topology.c to setup.c 



The only useful piece of arch/x86/kernel/topology.c is the definition
of arch_cpu_is_hotpluggable() that can be moved elsewhere (other
architectures tend to put it into setup.c), so do that and delete
the rest of the file.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/12422874.O9o76ZdvQC@kreacher
parent 4ae3dc83

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ obj-$(CONFIG_X86_64) += sys_x86_64.o 
obj-$(CONFIG_X86_ESPFIX64)	+= espfix_64.o

obj-$(CONFIG_SYSFS)	+= ksysfs.o

obj-y			+= bootflag.o e820.o

obj-y			+= pci-dma.o quirks.o topology.o kdebugfs.o

obj-y			+= pci-dma.o quirks.o kdebugfs.o

obj-y			+= alternative.o i8253.o hw_breakpoint.o

obj-y			+= tsc.o tsc_msr.o io_delay.o rtc.o

obj-y			+= resource.o

arch/x86/kernel/setup.c

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */

#include <linux/acpi.h>

#include <linux/console.h>

#include <linux/cpu.h>

#include <linux/crash_dump.h>

#include <linux/dma-map-ops.h>

#include <linux/dmi.h>
@@ -1227,3 +1228,10 @@ static int __init register_kernel_offset_dumper(void) 
	return 0;

}

__initcall(register_kernel_offset_dumper);



#ifdef CONFIG_HOTPLUG_CPU

bool arch_cpu_is_hotpluggable(int cpu)

{

	return cpu > 0;

}

#endif /* CONFIG_HOTPLUG_CPU */

arch/x86/kernel/topology.c

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

 * Populate sysfs with topology information

 *

 * Written by: Matthew Dobson, IBM Corporation

 * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL

 *

 * Copyright (C) 2002, IBM Corp.

 *

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or

 * NON INFRINGEMENT.  See the GNU General Public License for more

 * details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 *

 * Send feedback to <colpatch@us.ibm.com>

 */

#include <linux/interrupt.h>

#include <linux/nodemask.h>

#include <linux/export.h>

#include <linux/mmzone.h>

#include <linux/init.h>

#include <linux/smp.h>

#include <linux/irq.h>

#include <asm/io_apic.h>

#include <asm/cpu.h>



#ifdef CONFIG_HOTPLUG_CPU

bool arch_cpu_is_hotpluggable(int cpu)

{

	return cpu > 0;

}

#endif /* CONFIG_HOTPLUG_CPU */