]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
x86/platform/UV: Ensure uv_system_init is called when necessary
authortravis@sgi.com <travis@sgi.com>
Wed, 25 Jan 2017 16:35:23 +0000 (10:35 -0600)
committerIngo Molnar <mingo@kernel.org>
Wed, 1 Feb 2017 09:21:00 +0000 (10:21 +0100)
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>
arch/x86/kernel/smpboot.c

index 46732dc3b73cd67e874dfe99b0eeb807f816e06a..386c7f713c2a7d9f69a2f34f9bb069cb04d06cc7 100644 (file)
@@ -1341,8 +1341,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();