x86/uv changes for v5.1
Subsystems (2)
Linus,
Please pull the latest x86-uv-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-uv-for-linus
# HEAD: 8945d96f7b3ead56e053ac79b8f7b0de98a30bfe x86/platform/UV: Use efi_enabled() instead of test_bit()
Three UV related cleanups.
Thanks,
Ingo
------------------>
Hedi Berriche (3):
x86/platform/UV: Remove unnecessary #ifdef CONFIG_EFI x86/platform/UV: Remove uv_bios_call_reentrant() x86/platform/UV: Use efi_enabled() instead of test_bit()
arch/x86/include/asm/uv/bios.h | 5 ----- arch/x86/platform/uv/bios_uv.c | 16 +--------------- 2 files changed, 1 insertion(+), 20 deletions(-)
arch/x86/include/asm/uv/bios.h +0 -5
@@ -140,7 +140,6 @@ enum uv_memprotect {*/ extern s64 uv_bios_call (enum uv_bios_cmd ,u64 ,u64 ,u64 ,u64 ,u64 );extern s64 uv_bios_call_irqsave (enum uv_bios_cmd ,u64 ,u64 ,u64 ,u64 ,u64 ); -extern s64 uv_bios_call_reentrant (enum uv_bios_cmd ,u64 ,u64 ,u64 ,u64 ,u64 );extern s64 uv_bios_get_sn_info (int ,int *,long *,long *,long *,long *);extern s64 uv_bios_freq_base (u64 ,u64 *);
@@ -151,11 +150,7 @@ extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect);extern s64 uv_bios_reserved_page_pa (u64 ,u64 *,u64 *,u64 *);extern int uv_bios_set_legacy_vga_target (bool decode,int domain,int bus); -#ifdef CONFIG_EFI extern void uv_bios_init (void ); -#else -void uv_bios_init (void ) { } -#endif extern unsigned long sn_rtc_cycles_per_second;extern int uv_type;
arch/x86/platform/uv/bios_uv.c +1 -15
@@ -44,7 +44,7 @@ s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5)* If EFI_OLD_MEMMAP is set, we need to fall back to using our old EFI * callback method, which uses efi_call() directly, with the kernel page tables: */ -if (unlikely (test_bit (EFI_OLD_MEMMAP , &efi.flags))) +if (unlikely (efi_enabled (EFI_OLD_MEMMAP ))) ret =efi_call ((void *)__va (tab->function), (u64 )which, a1, a2, a3, a4, a5);else ret =efi_call_virt_pointer (tab, function, (u64 )which, a1, a2, a3, a4, a5);
@@ -66,18 +66,6 @@ s64 uv_bios_call_irqsave(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3,return ret; } -s64 uv_bios_call_reentrant (enum uv_bios_cmd which,u64 a1,u64 a2,u64 a3, -u64 a4,u64 a5) -{ -s64 ret; - -preempt_disable (); - ret =uv_bios_call (which, a1, a2, a3, a4, a5); -preempt_enable (); - -return ret; -} -long sn_partition_id;EXPORT_SYMBOL_GPL (sn_partition_id);
@@ -188,7 +176,6 @@ int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus) }EXPORT_SYMBOL_GPL (uv_bios_set_legacy_vga_target); -#ifdef CONFIG_EFI void uv_bios_init (void ) { uv_systab =NULL ;
@@ -218,4 +205,3 @@ void uv_bios_init(void) }pr_info ("UV: UVsystab: Revision:%x\n" , uv_systab->revision); } -#endif
The pull request you sent on Thu, 7 Mar 2019 20:55:59 +0100:
The pull request you sent on Thu, 7 Mar 2019 20:55:59 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-uv-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/610cd4eadec4f97acd25d3108b0e50d1362b3319
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker