Merge tag 'v4.9-rc1' into x86/urgent, to pick up updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -32,6 +32,8 @@
|
||||
#include <asm/nmi.h>
|
||||
#include <asm/mce.h>
|
||||
#include <asm/trace/irq_vectors.h>
|
||||
#include <asm/kexec.h>
|
||||
|
||||
/*
|
||||
* Some notes on x86 processor bugs affecting SMP operation:
|
||||
*
|
||||
@@ -344,6 +346,9 @@ struct smp_ops smp_ops = {
|
||||
.smp_cpus_done = native_smp_cpus_done,
|
||||
|
||||
.stop_other_cpus = native_stop_other_cpus,
|
||||
#if defined(CONFIG_KEXEC_CORE)
|
||||
.crash_stop_other_cpus = kdump_nmi_shootdown_cpus,
|
||||
#endif
|
||||
.smp_send_reschedule = native_smp_send_reschedule,
|
||||
|
||||
.cpu_up = native_cpu_up,
|
||||
|
||||
Reference in New Issue
Block a user