From 135b67e9bd5281084efe9fb1d3604915dac07ce8 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 20 Dec 2017 15:44:57 +0100 Subject: [PATCH] xen/efi: Fix build with clang-5.0 The clang-5.0 build is reliably failing with: Error: size of boot.o:.text is 0x01 which is because efi_arch_flush_dcache_area() exists as a single ret instruction. Mark it as __init like everything else in the files. Spotted by Travis. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich master commit: c4f6ad4c5fd25cb0ccc0cdbe711db97e097f0407 master date: 2017-12-14 10:59:26 +0000 --- xen/arch/arm/efi/efi-boot.h | 2 +- xen/arch/x86/efi/efi-boot.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 56de26e918..ca655ff003 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -597,7 +597,7 @@ static void __init efi_arch_video_init(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop, { } -static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) +static void __init efi_arch_flush_dcache_area(const void *vaddr, UINTN size) { __flush_dcache_area(vaddr, size); } diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 8d295ff9af..d30f688a5a 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -668,7 +668,7 @@ static bool __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) return true; /* x86 always uses a config file */ } -static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) { } +static void __init efi_arch_flush_dcache_area(const void *vaddr, UINTN size) { } void __init efi_multiboot2(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { -- 2.39.5