tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branches 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer and x86 fix from Ingo Molnar:
"A CLOCK_TAI early expiry fix and an x86 microcode driver oops fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hrtimer: Fix incorrect tai offset calculation for non high-res timer systems

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode: Return error from driver init code when loader is disabled

Linus Torvalds 26cdd1f7 396e9099

+2 -2
+1 -1
arch/x86/kernel/cpu/microcode/core.c
··· 552 552 int error; 553 553 554 554 if (paravirt_enabled() || dis_ucode_ldr) 555 - return 0; 555 + return -EINVAL; 556 556 557 557 if (c->x86_vendor == X86_VENDOR_INTEL) 558 558 microcode_ops = init_intel_microcode();
+1 -1
kernel/time/hrtimer.c
··· 122 122 mono = ktime_get_update_offsets_tick(&off_real, &off_boot, &off_tai); 123 123 boot = ktime_add(mono, off_boot); 124 124 xtim = ktime_add(mono, off_real); 125 - tai = ktime_add(xtim, off_tai); 125 + tai = ktime_add(mono, off_tai); 126 126 127 127 base->clock_base[HRTIMER_BASE_REALTIME].softirq_time = xtim; 128 128 base->clock_base[HRTIMER_BASE_MONOTONIC].softirq_time = mono;