Skip to content

Commit fe30021

Browse files
committed
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Two fixes: disable unreliable HPET on Intel Coffe Lake platforms, and fix a lockdep splat in the resctrl code" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/resctrl: Fix potential lockdep warning x86/quirks: Disable HPET on Intel Coffe Lake platforms
2 parents 3278b3b + c8eafe1 commit fe30021

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

arch/x86/kernel/cpu/resctrl/rdtgroup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,8 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,
461461
}
462462

463463
rdtgrp = rdtgroup_kn_lock_live(of->kn);
464-
rdt_last_cmd_clear();
465464
if (!rdtgrp) {
466465
ret = -ENOENT;
467-
rdt_last_cmd_puts("Directory was removed\n");
468466
goto unlock;
469467
}
470468

@@ -2648,10 +2646,8 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
26482646
int ret;
26492647

26502648
prdtgrp = rdtgroup_kn_lock_live(prgrp_kn);
2651-
rdt_last_cmd_clear();
26522649
if (!prdtgrp) {
26532650
ret = -ENODEV;
2654-
rdt_last_cmd_puts("Directory was removed\n");
26552651
goto out_unlock;
26562652
}
26572653

arch/x86/kernel/early-quirks.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,8 @@ static struct chipset early_qrk[] __initdata = {
710710
*/
711711
{ PCI_VENDOR_ID_INTEL, 0x0f00,
712712
PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
713+
{ PCI_VENDOR_ID_INTEL, 0x3ec4,
714+
PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
713715
{ PCI_VENDOR_ID_BROADCOM, 0x4331,
714716
PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
715717
{}

0 commit comments

Comments
 (0)