Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Sep 2017 18:34:39 +0000 (11:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Sep 2017 18:34:39 +0000 (11:34 -0700)
commit680352bda57e3dbf21cddf6a5e23aff7e294fb31
treec047ee0678ab793e85f89bf95bd8eee574b066e2
parent040b9d7ccff40e1fbd48029e3c769db188a3ba2c
parente2329b4252f373c244e75928be38bf1dd45b35da
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Two fixes: dead code removal, plus a SME memory encryption fix on
  32-bit kernels that crashed Xen guests"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Remove unused and undefined __generic_processor_info() declaration
  x86/mm: Make the SME mask a u64
arch/x86/kernel/apic/apic.c