diff options
author | travis@sgi.com <travis@sgi.com> | 2017-01-25 11:35:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 04:21:00 -0500 |
commit | 9ec808a0225aabab59fb2932b70784b087ac0f58 (patch) | |
tree | 42ecd96567d90f48e1126d19f51b2effa9f541c4 /arch/x86/kernel | |
parent | 56e17ca2c5ed31f5812ed8e0694e7ef880068cfd (diff) |
x86/platform/UV: Ensure uv_system_init is called when necessary
Move the check to whether this is a UV system that needs initialization
from is_uv_system() to the internal uv_system_init() function. This is
because on a UV system without a HUB the is_uv_system() returns false.
But we still need some specific UV system initialization. See the
uv_system_init() for change to a quick check if UV is applicable. This
change should not increase overhead since is_uv_system() also called
into this same area.
Signed-off-by: Mike Travis <travis@sgi.com>
Reviewed-by: Russ Anderson <rja@hpe.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Dimitri Sivanich <sivanich@hpe.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170125163518.256403963@asylum.americas.sgi.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 46732dc3b73c..386c7f713c2a 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -1341,8 +1341,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1341 | pr_info("CPU0: "); | 1341 | pr_info("CPU0: "); |
1342 | print_cpu_info(&cpu_data(0)); | 1342 | print_cpu_info(&cpu_data(0)); |
1343 | 1343 | ||
1344 | if (is_uv_system()) | 1344 | uv_system_init(); |
1345 | uv_system_init(); | ||
1346 | 1345 | ||
1347 | set_mtrr_aps_delayed_init(); | 1346 | set_mtrr_aps_delayed_init(); |
1348 | 1347 | ||