diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
commit | 76523de61993d015f7895d06deacd3fd454574a1 (patch) | |
tree | 7b2890ac9733c55ff73c72bba7b6b5c788ba925b /arch/x86/kernel/smpboot.c | |
parent | uprobes/x86: Emulate push insns for uprobe on x86 (diff) | |
parent | Linux 4.15-rc3 (diff) | |
download | linux-76523de61993d015f7895d06deacd3fd454574a1.tar.xz linux-76523de61993d015f7895d06deacd3fd454574a1.zip |
Merge tag 'v4.15-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 3d01df7d7cf6..05a97d5fe298 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -237,7 +237,7 @@ static void notrace start_secondary(void *unused) load_cr3(swapper_pg_dir); __flush_tlb_all(); #endif - + load_current_idt(); cpu_init(); x86_cpuinit.early_percpu_clock_init(); preempt_disable(); |