diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-16 17:36:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-16 17:36:12 +0200 |
| commit | d0d27ef87e1ca974ed93ed4f7d3c123cbd392ba6 (patch) | |
| tree | f7c3e3259579973c896c634e2bdabed31a171395 /arch/x86/include/asm/cpu.h | |
| parent | 1034cc423f1b4a7a9a56d310ca980fcd2753e11d (diff) | |
| parent | 58720809f52779dc0f08e53e54b014209d13eebb (diff) | |
| download | linux-d0d27ef87e1ca974ed93ed4f7d3c123cbd392ba6.tar.gz linux-d0d27ef87e1ca974ed93ed4f7d3c123cbd392ba6.tar.bz2 linux-d0d27ef87e1ca974ed93ed4f7d3c123cbd392ba6.zip | |
Merge 6.6-rc6 into usb-next
We need the USB and Thunderbolt fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include/asm/cpu.h')
| -rw-r--r-- | arch/x86/include/asm/cpu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index 3a233ebff712..25050d953eee 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -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 |