[xen stable-4.9] xen/efi: Fix build with clang-5.0

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen stable-4.9] xen/efi: Fix build with clang-5.0

patchbot
commit 6a39a56030b2eb8e89a9e5f0097d09c092bf3190
Author:     Andrew Cooper <[hidden email]>
AuthorDate: Wed Dec 20 15:58:55 2017 +0100
Commit:     Jan Beulich <[hidden email]>
CommitDate: Wed Dec 20 15:58:55 2017 +0100

    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 <[hidden email]>
    Reviewed-by: Stefano Stabellini <[hidden email]>
    Acked-by: Jan Beulich <[hidden email]>
    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 2986c83..1e61359 100644
--- a/xen/arch/arm/efi/efi-boot.h
+++ b/xen/arch/arm/efi/efi-boot.h
@@ -596,7 +596,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 16e3214..95c1f5d 100644
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -668,7 +668,7 @@ static bool_t __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable)
     return 1; /* 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)
 {
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.9

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog