diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-15 08:44:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-15 08:44:56 -0700 |
| commit | ddf2085598021bc84c01b1e1ac3ed992045f23ec (patch) | |
| tree | afbcae11dd4a3d5eca87b96783861cff19a6c61d /include | |
| parent | 9a3dad63edbe9a2ab2be1e7361a2133f519f855b (diff) | |
| parent | c4dd854f740c21ae8dd9903fc67969c5497cb14b (diff) | |
| download | mailbox-ddf2085598021bc84c01b1e1ac3ed992045f23ec.tar.gz | |
Merge tag 'smp-urgent-2023-10-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull CPU hotplug fix from Ingo Molnar:
"Fix a Longsoon build warning by harmonizing the
arch_[un]register_cpu() prototypes between architectures"
* tag 'smp-urgent-2023-10-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpu-hotplug: Provide prototypes for arch CPU registration
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/processor.h | 5 | ||||
| -rw-r--r-- | include/linux/cpu.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 94181fe9780a5e..3f34ebb275253e 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -465,9 +465,4 @@ extern int acpi_processor_ffh_lpi_probe(unsigned int cpu); extern int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi); #endif -#ifdef CONFIG_ACPI_HOTPLUG_CPU -extern int arch_register_cpu(int cpu); -extern void arch_unregister_cpu(int cpu); -#endif - #endif diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 0abd60a7987b68..eb768a866fe31e 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -80,6 +80,8 @@ extern __printf(4, 5) struct device *cpu_device_create(struct device *parent, void *drvdata, const struct attribute_group **groups, const char *fmt, ...); +extern int arch_register_cpu(int cpu); +extern void arch_unregister_cpu(int cpu); #ifdef CONFIG_HOTPLUG_CPU extern void unregister_cpu(struct cpu *cpu); extern ssize_t arch_cpu_probe(const char *, size_t); |