Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2abf1932) · Commits · 戴 / test

Pull timer fixes from Ingo Molnar: "Add HPET quirks for the Intel 'Coffee Lake H' and 'Ice Lake' platforms" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/intel: Disable HPET on Intel Ice Lake platforms x86/intel: Disable HPET on Intel Coffee Lake H platforms

arch/x86/kernel/early-quirks.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -710,8 +710,12 @@ static struct chipset early_qrk[] __initdata = {
		*/
		{ PCI_VENDOR_ID_INTEL, 0x0f00,
		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
		{ PCI_VENDOR_ID_INTEL, 0x3e20,
		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
		{ PCI_VENDOR_ID_INTEL, 0x3ec4,
		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
		{ PCI_VENDOR_ID_INTEL, 0x8a12,
		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
		{ PCI_VENDOR_ID_BROADCOM, 0x4331,
		PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
		{}

Admin message