From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751854AbdBAKNB (ORCPT ); Wed, 1 Feb 2017 05:13:01 -0500 Received: from terminus.zytor.com ([65.50.211.136]:56442 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751325AbdBAKM7 (ORCPT ); Wed, 1 Feb 2017 05:12:59 -0500 Date: Wed, 1 Feb 2017 02:12:24 -0800 From: "tip-bot for travis@sgi.com" Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, travis@sgi.com, sivanich@hpe.com, peterz@infradead.org, mingo@kernel.org, rja@hpe.com, torvalds@linux-foundation.org Reply-To: tglx@linutronix.de, travis@sgi.com, hpa@zytor.com, linux-kernel@vger.kernel.org, sivanich@hpe.com, rja@hpe.com, mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org In-Reply-To: <20170125163518.256403963@asylum.americas.sgi.com> References: <20170125163518.256403963@asylum.americas.sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/UV: Ensure uv_system_init is called when necessary Git-Commit-ID: 9ec808a0225aabab59fb2932b70784b087ac0f58 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9ec808a0225aabab59fb2932b70784b087ac0f58 Gitweb: http://git.kernel.org/tip/9ec808a0225aabab59fb2932b70784b087ac0f58 Author: travis@sgi.com AuthorDate: Wed, 25 Jan 2017 10:35:23 -0600 Committer: Ingo Molnar CommitDate: Wed, 1 Feb 2017 10:21:00 +0100 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 Reviewed-by: Russ Anderson Acked-by: Thomas Gleixner Acked-by: Dimitri Sivanich Cc: Linus Torvalds Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170125163518.256403963@asylum.americas.sgi.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/smpboot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 46732dc..386c7f7 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) pr_info("CPU0: "); print_cpu_info(&cpu_data(0)); - if (is_uv_system()) - uv_system_init(); + uv_system_init(); set_mtrr_aps_delayed_init();