]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
initramfs: fix clang build failure
authorArnd Bergmann <arnd@arndb.de>
Fri, 11 Dec 2020 21:36:42 +0000 (13:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2020 22:02:14 +0000 (14:02 -0800)
There is only one function in init/initramfs.c that is in the .text
section, and it is marked __weak.  When building with clang-12 and the
integrated assembler, this leads to a bug with recordmcount:

  ./scripts/recordmcount  "init/initramfs.o"
  Cannot find symbol for section 2: .text.
  init/initramfs.o: failed

I'm not quite sure what exactly goes wrong, but I notice that this
function is only ever called from an __init function, and normally
inlined.  Marking it __init as well is clearly correct and it leads to
recordmcount no longer complaining.

Link: https://lkml.kernel.org/r/20201204165742.3815221-1-arnd@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Barret Rhoden <brho@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
init/initramfs.c

index 1f97c0328a7ae7b7eaedb2ab0daa4d4e2c29354f..55b74d7e526075d94145af4430037b52413722a2 100644 (file)
@@ -535,7 +535,7 @@ extern unsigned long __initramfs_size;
 #include <linux/initrd.h>
 #include <linux/kexec.h>
 
-void __weak free_initrd_mem(unsigned long start, unsigned long end)
+void __weak __init free_initrd_mem(unsigned long start, unsigned long end)
 {
 #ifdef CONFIG_ARCH_KEEP_MEMBLOCK
        unsigned long aligned_start = ALIGN_DOWN(start, PAGE_SIZE);