From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752081AbeANTYj (ORCPT + 1 other); Sun, 14 Jan 2018 14:24:39 -0500 Received: from terminus.zytor.com ([65.50.211.136]:50527 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751759AbeANTYh (ORCPT ); Sun, 14 Jan 2018 14:24:37 -0500 Date: Sun, 14 Jan 2018 11:22:19 -0800 From: tip-bot for Peter Zijlstra Message-ID: Cc: peterz@infradead.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org In-Reply-To: <20171222092243.382623763@infradead.org> References: <20171222092243.382623763@infradead.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/timers] x86/time: Unconditionally register legacy timer interrupt Git-Commit-ID: 6d671e1b85c63e7a337ba76c1a154c091545cff8 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 Return-Path: Commit-ID: 6d671e1b85c63e7a337ba76c1a154c091545cff8 Gitweb: https://git.kernel.org/tip/6d671e1b85c63e7a337ba76c1a154c091545cff8 Author: Peter Zijlstra AuthorDate: Fri, 22 Dec 2017 10:20:12 +0100 Committer: Thomas Gleixner CommitDate: Sun, 14 Jan 2018 20:18:23 +0100 x86/time: Unconditionally register legacy timer interrupt Even without a PIC/PIT the legacy timer interrupt is required for HPET in legacy replacement mode. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Thomas Gleixner Cc: len.brown@intel.com Cc: rui.zhang@intel.com Link: https://lkml.kernel.org/r/20171222092243.382623763@infradead.org --- arch/x86/kernel/time.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c index 749d189..774ebaf 100644 --- a/arch/x86/kernel/time.c +++ b/arch/x86/kernel/time.c @@ -69,9 +69,12 @@ static struct irqaction irq0 = { static void __init setup_default_timer_irq(void) { - if (!nr_legacy_irqs()) - return; - setup_irq(0, &irq0); + /* + * Unconditionally register the legacy timer; even without legacy + * PIC/PIT we need this for the HPET0 in legacy replacement mode. + */ + if (setup_irq(0, &irq0)) + pr_info("Failed to register legacy timer interrupt\n"); } /* Default timer init function */