Commit c4dd854f authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Thomas Gleixner
Browse files

cpu-hotplug: Provide prototypes for arch CPU registration 



Provide common prototypes for arch_register_cpu() and
arch_unregister_cpu(). These are called by acpi_processor.c, with weak
versions, so the prototype for this is already set. It is generally not
necessary for function prototypes to be conditional on preprocessor macros.

Some architectures (e.g. Loongarch) are missing the prototype for this, and
rather than add it to Loongarch's asm/cpu.h, do the job once for everyone.

Since this covers everyone, remove the now unnecessary prototypes in
asm/cpu.h, and therefore remove the 'static' from one of ia64's
arch_register_cpu() definitions.

[ tglx: Bring back the ia64 part and remove the ACPI prototypes ]

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/E1qkoRr-0088Q8-Da@rmk-PC.armlinux.org.uk
parent 94f6f055

arch/ia64/include/asm/cpu.h

+0 −5
Original line number Diff line number Diff line
@@ -15,9 +15,4 @@ DECLARE_PER_CPU(struct ia64_cpu, cpu_devices); 


DECLARE_PER_CPU(int, cpu_state);



#ifdef CONFIG_HOTPLUG_CPU

extern int arch_register_cpu(int num);

extern void arch_unregister_cpu(int);

#endif



#endif /* _ASM_IA64_CPU_H_ */

arch/ia64/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void __ref arch_unregister_cpu(int num) 
}

EXPORT_SYMBOL(arch_unregister_cpu);

#else

static int __init arch_register_cpu(int num)

int __init arch_register_cpu(int num)

{

	return register_cpu(&sysfs_cpus[num].cpu, num);

}

arch/x86/include/asm/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ struct x86_cpu { 
};



#ifdef CONFIG_HOTPLUG_CPU

extern int arch_register_cpu(int num);

extern void arch_unregister_cpu(int);

extern void soft_restart_cpu(void);

#endif

arch/x86/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void arch_unregister_cpu(int num) 
EXPORT_SYMBOL(arch_unregister_cpu);

#else /* CONFIG_HOTPLUG_CPU */



static int __init arch_register_cpu(int num)

int __init arch_register_cpu(int num)

{

	return register_cpu(&per_cpu(cpu_devices, num).cpu, num);

}

drivers/acpi/acpi_processor.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/acpi.h>

#include <linux/cpu.h>

#include <linux/device.h>

#include <linux/dmi.h>

#include <linux/kernel.h>