From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755045AbcFQFZk (ORCPT ); Fri, 17 Jun 2016 01:25:40 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:33759 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754537AbcFQFX0 (ORCPT ); Fri, 17 Jun 2016 01:23:26 -0400 From: Len Brown To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown Subject: [PATCH 02/10] x86 tsc_msr: Identify Intel-specific code Date: Fri, 17 Jun 2016 01:22:44 -0400 Message-Id: <1fe23c052826bdcfeb3d45045aa02246078cb5a7.1466138954.git.len.brown@intel.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160617052252.25991-1-lenb@kernel.org> References: <20160617052252.25991-1-lenb@kernel.org> In-Reply-To: <2199d0e959f7f71a18827268b5d060f8d3831639.1466138954.git.len.brown@intel.com> References: <2199d0e959f7f71a18827268b5d060f8d3831639.1466138954.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Len Brown try_msr_calibrate_tsc() is currently Intel-specific, and should not execute on any other vendor's parts. Signed-off-by: Len Brown --- arch/x86/kernel/tsc_msr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c index 6aa0f4d..4ec5e56 100644 --- a/arch/x86/kernel/tsc_msr.c +++ b/arch/x86/kernel/tsc_msr.c @@ -86,6 +86,9 @@ unsigned long try_msr_calibrate_tsc(void) unsigned long res; int cpu_index; + if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) + return 0; + cpu_index = match_cpu(boot_cpu_data.x86, boot_cpu_data.x86_model); if (cpu_index < 0) return 0; -- 2.9.0