Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Mar 2019 02:26:39 +0000 (18:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Mar 2019 02:26:39 +0000 (18:26 -0800)
commit610cd4eadec4f97acd25d3108b0e50d1362b3319
tree8ac3e4d0b20553bc8d3f337469a02f92e07a1b5a
parent60970c18aa95d5ce7716faa67d8ccae4f15fc12b
parent8945d96f7b3ead56e053ac79b8f7b0de98a30bfe
Merge branch 'x86-uv-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 UV updates from Ingo Molnar:
 "Three UV related cleanups"

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/UV: Use efi_enabled() instead of test_bit()
  x86/platform/UV: Remove uv_bios_call_reentrant()
  x86/platform/UV: Remove unnecessary #ifdef CONFIG_EFI
arch/x86/include/asm/uv/bios.h
arch/x86/platform/uv/bios_uv.c