diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2023-08-30 10:10:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2023-08-30 10:10:31 -0700 |
| commit | 87fa732dc5ff9ea6a2e75b630f7931899e845eb1 (patch) | |
| tree | e6a5e9223b3c45daa8179d859feb6234ab060055 /arch/x86/include | |
| parent | Merge tag 'x86_mm_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | x86/kprobes: Prohibit probing on compiler generated CFI checking code (diff) | |
| download | linux-87fa732dc5ff9ea6a2e75b630f7931899e845eb1.tar.gz linux-87fa732dc5ff9ea6a2e75b630f7931899e845eb1.tar.bz2 linux-87fa732dc5ff9ea6a2e75b630f7931899e845eb1.zip | |
Merge tag 'x86-core-2023-08-30-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 core updates from Thomas Gleixner:
- Prevent kprobes on compiler generated CFI checking code.
The compiler generates an instruction sequence for indirect call
checks. If this sequence is modified with a kprobe, then the check
fails. So the instructions must be protected against probing.
- A few minor cleanups for the SMP code
* tag 'x86-core-2023-08-30-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kprobes: Prohibit probing on compiler generated CFI checking code
x86/smpboot: Change smp_store_boot_cpu_info() to static
x86/smp: Remove a non-existent function declaration
x86/smpboot: Remove a stray comment about CPU hotplug
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/smp.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 600cf25dbfc6..cf7217ad5701 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -132,11 +132,8 @@ void smp_kick_mwait_play_dead(void); void native_smp_send_reschedule(int cpu); void native_send_call_func_ipi(const struct cpumask *mask); void native_send_call_func_single_ipi(int cpu); -void x86_idle_thread_init(unsigned int cpu, struct task_struct *idle); bool smp_park_other_cpus_in_init(void); - -void smp_store_boot_cpu_info(void); void smp_store_cpu_info(int id); asmlinkage __visible void smp_reboot_interrupt(void); |