diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-15 17:44:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-15 17:44:56 +0200 |
commit | ddf2085598021bc84c01b1e1ac3ed992045f23ec (patch) | |
tree | afbcae11dd4a3d5eca87b96783861cff19a6c61d /drivers/acpi | |
parent | Merge tag '6.6-rc5-ksmbd-server-fixes' of git://git.samba.org/ksmbd (diff) | |
parent | cpu-hotplug: Provide prototypes for arch CPU registration (diff) | |
download | linux-ddf2085598021bc84c01b1e1ac3ed992045f23ec.tar.xz linux-ddf2085598021bc84c01b1e1ac3ed992045f23ec.zip |
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 'drivers/acpi')
-rw-r--r-- | drivers/acpi/acpi_processor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index c711db8a9c33..0f5218e361df 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -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> |