summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-02-16 17:25:33 +0100
committerIngo Molnar <mingo@kernel.org>2017-02-16 17:25:33 +0100
commit28605576aad7521ba0934d2591a403cc89d2c09e (patch)
tree0b235d809c85a6d56b2a89c6dfa72c4a2859492c /arch/x86/kernel/smpboot.c
parent1bec46d5b4919f17f633651d2ac6b5c9a0e82b64 (diff)
parentd48085f0716f195ee7432de2dd110e2093c40fd5 (diff)
Merge branch 'x86/platform'
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 99b920d0e516..a0d38685f7df 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1347,8 +1347,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
pr_info("CPU0: ");
print_cpu_info(&cpu_data(0));
- if (is_uv_system())
- uv_system_init();
+ uv_system_init();
set_mtrr_aps_delayed_init();