The patch titled x86: hpet: allow force enable on ICH10 HPET has been added to the -mm tree. Its filename is x86-hpet-allow-force-enable-on-ich10-hpet.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86: hpet: allow force enable on ICH10 HPET From: Andi Kleen <andi@xxxxxxxxxxxxxx> Intel "Smackover" x58 BIOS don't have HPET enabled in the BIOS, so allow to force enable it at least. The register layout is the same as in other recent ICHs, so all the code can be reused. Using numerical PCI-ID because it's unlikely the PCI-ID will be used anywhere else. Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/quirks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN arch/x86/kernel/quirks.c~x86-hpet-allow-force-enable-on-ich10-hpet arch/x86/kernel/quirks.c --- a/arch/x86/kernel/quirks.c~x86-hpet-allow-force-enable-on-ich10-hpet +++ a/arch/x86/kernel/quirks.c @@ -172,7 +172,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I ich_force_enable_hpet); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7, ich_force_enable_hpet); - +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x3a16, /* ICH10 */ + ich_force_enable_hpet); static struct pci_dev *cached_dev; _ Patches currently in -mm which might be from andi@xxxxxxxxxxxxxx are origin.patch x86-only-scan-the-root-bus-in-early-pci-quirks.patch x86-hpet-allow-force-enable-on-ich10-hpet.patch remove-remaining-unwinder-code.patch elf-implement-at_random-for-glibc-prng-seeding.patch nilfs2-fix-problems-of-memory-allocation-in-ioctl.patch mark-complex-bitopsh-inlines-as-__always_inline.patch avoid-theoretical-vmalloc-fault-loop.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html