Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26cdd1f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of... 

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
parents 396e9099 2d926c15 6d84d1d1

arch/x86/kernel/cpu/microcode/core.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static int __init microcode_init(void) 
	int error;



	if (paravirt_enabled() || dis_ucode_ldr)

		return 0;

		return -EINVAL;



	if (c->x86_vendor == X86_VENDOR_INTEL)

		microcode_ops = init_intel_microcode();

kernel/time/hrtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) 
	mono = ktime_get_update_offsets_tick(&off_real, &off_boot, &off_tai);

	boot = ktime_add(mono, off_boot);

	xtim = ktime_add(mono, off_real);

	tai = ktime_add(xtim, off_tai);

	tai = ktime_add(mono, off_tai);



	base->clock_base[HRTIMER_BASE_REALTIME].softirq_time = xtim;

	base->clock_base[HRTIMER_BASE_MONOTONIC].softirq_time = mono;