Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 26cdd1f76a889a21faa851bcb260782db2c7f0a9

Authored by Linus Torvalds
3 parents 396e9099ea 2d926c15d6 6d84d1d130
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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

Showing 2 changed files Side-by-side Diff

arch/x86/kernel/cpu/microcode/core.c
Diff comments   View file @ 26cdd1f
... ... @@ -552,7 +552,7 @@
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();
kernel/time/hrtimer.c
Diff comments   View file @ 26cdd1f
... ... @@ -122,7 +122,7 @@
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;