x86/platform/UV: Remove unnecessary #ifdef CONFIG_EFI (30ad3e03) · Commits · 戴 / test

CONFIG_EFI is implied by CONFIG_X86_UV and x86/platform/uv/bios_uv.c requires the latter, get rid of the redundant #ifdef CONFIG_EFI directives. Cleanup, no functional changes. Signed-off-by:

Hedi Berriche <hedi.berriche@hpe.com> Signed-off-by:

Borislav Petkov <bp@suse.de> Reviewed-by:

Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by:

Russ Anderson <rja@hpe.com> Reviewed-by:

Dimitri Sivanich <sivanich@hpe.com> Reviewed-by:

Mike Travis <mike.travis@hpe.com> Cc: Andy Shevchenko <andy@infradead.org> Cc: Bhupesh Sharma <bhsharma@redhat.com> Cc: Darren Hart <dvhart@infradead.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: linux-efi <linux-efi@vger.kernel.org> Cc: platform-driver-x86@vger.kernel.org Cc: Steve Wahl <steve.wahl@hpe.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Link: https://lkml.kernel.org/r/20190213193413.25560-2-hedi.berriche@hpe.com

arch/x86/include/asm/uv/bios.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -151,11 +151,7 @@ extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect);
	extern s64 uv_bios_reserved_page_pa(u64, u64 , u64 , u64 *);		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);		extern int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus);

	#ifdef CONFIG_EFI
	extern void uv_bios_init(void);		extern void uv_bios_init(void);
	#else
	void uv_bios_init(void) { }
	#endif

	extern unsigned long sn_rtc_cycles_per_second;		extern unsigned long sn_rtc_cycles_per_second;
	extern int uv_type;		extern int uv_type;

arch/x86/platform/uv/bios_uv.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -188,7 +188,6 @@ int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus)
	}		}
	EXPORT_SYMBOL_GPL(uv_bios_set_legacy_vga_target);		EXPORT_SYMBOL_GPL(uv_bios_set_legacy_vga_target);

	#ifdef CONFIG_EFI
	void uv_bios_init(void)		void uv_bios_init(void)
	{		{
	uv_systab = NULL;		uv_systab = NULL;
	@@ -218,4 +217,3 @@ void uv_bios_init(void)
	}		}
	pr_info("UV: UVsystab: Revision:%x\n", uv_systab->revision);		pr_info("UV: UVsystab: Revision:%x\n", uv_systab->revision);
	}		}
	#endif

Admin message