tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds ddf20855 9a3dad63

+5 -14
-5
arch/ia64/include/asm/cpu.h
··· 15 15 16 16 DECLARE_PER_CPU(int, cpu_state); 17 17 18 - #ifdef CONFIG_HOTPLUG_CPU 19 - extern int arch_register_cpu(int num); 20 - extern void arch_unregister_cpu(int); 21 - #endif 22 - 23 18 #endif /* _ASM_IA64_CPU_H_ */
+1 -1
arch/ia64/kernel/topology.c
··· 59 59 } 60 60 EXPORT_SYMBOL(arch_unregister_cpu); 61 61 #else 62 - static int __init arch_register_cpu(int num) 62 + int __init arch_register_cpu(int num) 63 63 { 64 64 return register_cpu(&sysfs_cpus[num].cpu, num); 65 65 }
-2
arch/x86/include/asm/cpu.h
··· 28 28 }; 29 29 30 30 #ifdef CONFIG_HOTPLUG_CPU 31 - extern int arch_register_cpu(int num); 32 - extern void arch_unregister_cpu(int); 33 31 extern void soft_restart_cpu(void); 34 32 #endif 35 33
+1 -1
arch/x86/kernel/topology.c
··· 54 54 EXPORT_SYMBOL(arch_unregister_cpu); 55 55 #else /* CONFIG_HOTPLUG_CPU */ 56 56 57 - static int __init arch_register_cpu(int num) 57 + int __init arch_register_cpu(int num) 58 58 { 59 59 return register_cpu(&per_cpu(cpu_devices, num).cpu, num); 60 60 }
+1
drivers/acpi/acpi_processor.c
··· 12 12 #define pr_fmt(fmt) "ACPI: " fmt 13 13 14 14 #include <linux/acpi.h> 15 + #include <linux/cpu.h> 15 16 #include <linux/device.h> 16 17 #include <linux/dmi.h> 17 18 #include <linux/kernel.h>
-5
include/acpi/processor.h
··· 465 465 extern int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi); 466 466 #endif 467 467 468 - #ifdef CONFIG_ACPI_HOTPLUG_CPU 469 - extern int arch_register_cpu(int cpu); 470 - extern void arch_unregister_cpu(int cpu); 471 - #endif 472 - 473 468 #endif
+2
include/linux/cpu.h
··· 80 80 struct device *cpu_device_create(struct device *parent, void *drvdata, 81 81 const struct attribute_group **groups, 82 82 const char *fmt, ...); 83 + extern int arch_register_cpu(int cpu); 84 + extern void arch_unregister_cpu(int cpu); 83 85 #ifdef CONFIG_HOTPLUG_CPU 84 86 extern void unregister_cpu(struct cpu *cpu); 85 87 extern ssize_t arch_cpu_probe(const char *, size_t);