The workaround is a port of a recent Linux change, replacing earlier, never accepted attempts to follow Linux in their PCI ID based working around of the issue. The other patch is long due cleanup that I happened to notice along the way.
1: x86/hpet: Use another crystalball to evaluate HPET usability 2: x86: de-duplicate MONITOR/MWAIT CPUID-related definitions Jan