]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2019 13:47:35 +0000 (14:47 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2019 13:47:35 +0000 (14:47 +0100)
Pull x86 fixes from Ingo Molnar:
 "A KVM guest fix, and a kdump kernel relocation errors fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/timer: Force PIT initialization when !X86_FEATURE_ARAT
  x86/purgatory: Change compiler flags from -mcmodel=kernel to -mcmodel=large to fix kexec relocation errors

1  2 
arch/x86/kernel/apic/apic.c

Simple merge