From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751128AbdFTK02 (ORCPT ); Tue, 20 Jun 2017 06:26:28 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50541 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbdFTK00 (ORCPT ); Tue, 20 Jun 2017 06:26:26 -0400 Date: Tue, 20 Jun 2017 03:25:16 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de Reply-To: hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <20170620093154.18472-1-bp@alien8.de> References: <20170620093154.18472-1-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/timers] x86/hpet: Do not use smp_processor_id() in preemptible code Git-Commit-ID: 803ff8a7a6c9f89945edc07c5e969c2e11e2209b 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: 803ff8a7a6c9f89945edc07c5e969c2e11e2209b Gitweb: http://git.kernel.org/tip/803ff8a7a6c9f89945edc07c5e969c2e11e2209b Author: Borislav Petkov AuthorDate: Tue, 20 Jun 2017 11:31:54 +0200 Committer: Thomas Gleixner CommitDate: Tue, 20 Jun 2017 12:23:26 +0200 x86/hpet: Do not use smp_processor_id() in preemptible code When hpet=force is supplied on the kernel command line and the HPET supports the Legacy Replacement Interrupt Route option (HPET_ID_LEGSUP), the legacy interrupts init code uses the boot CPU's mask initially by calling smp_processor_id() assuming that it is running on the BSP. It does run on the BSP but the code region is preemptible and the preemption check fires. Simply use the BSP's id directly to avoid the warning. Signed-off-by: Borislav Petkov Link: http://lkml.kernel.org/r/20170620093154.18472-1-bp@alien8.de Signed-off-by: Thomas Gleixner --- arch/x86/kernel/hpet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 89ff7af..16f82a3 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -285,7 +285,7 @@ static void hpet_legacy_clockevent_register(void) * Start hpet with the boot cpu mask and make it * global after the IO_APIC has been initialized. */ - hpet_clockevent.cpumask = cpumask_of(smp_processor_id()); + hpet_clockevent.cpumask = cpumask_of(boot_cpu_data.cpu_index); clockevents_config_and_register(&hpet_clockevent, hpet_freq, HPET_MIN_PROG_DELTA, 0x7FFFFFFF); global_clock_event = &hpet_clockevent;