diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2017-12-22 10:20:12 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-01-14 20:18:23 +0100 |
| commit | 6d671e1b85c63e7a337ba76c1a154c091545cff8 (patch) | |
| tree | 7093ebb0bdc7c2162b5cbbf1c04119056090a427 | |
| parent | 30c7e5b123673d5e570e238dbada2fb68a87212c (diff) | |
| download | lwn-6d671e1b85c63e7a337ba76c1a154c091545cff8.tar.gz lwn-6d671e1b85c63e7a337ba76c1a154c091545cff8.zip | |
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) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: len.brown@intel.com
Cc: rui.zhang@intel.com
Link: https://lkml.kernel.org/r/20171222092243.382623763@infradead.org
| -rw-r--r-- | arch/x86/kernel/time.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c index 749d189f8cd4..774ebafa97c4 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 */ |