Patch "riscv: vdso: fix and clean-up Makefile" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    riscv: vdso: fix and clean-up Makefile

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     riscv-vdso-fix-and-clean-up-makefile.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 8aafbd64da80c2d17994d435c0afc113cba4afa4
Author: Jisheng Zhang <jszhang@xxxxxxxxxx>
Date:   Fri Apr 2 21:29:08 2021 +0800

    riscv: vdso: fix and clean-up Makefile
    
    [ Upstream commit 772d7891e8b3b0baae7bb88a294d61fd07ba6d15 ]
    
    Running "make" on an already compiled kernel tree will rebuild the
    kernel even without any modifications:
    
      CALL    linux/scripts/checksyscalls.sh
      CALL    linux/scripts/atomic/check-atomics.sh
      CHK     include/generated/compile.h
      SO2S    arch/riscv/kernel/vdso/vdso-syms.S
      AS      arch/riscv/kernel/vdso/vdso-syms.o
      AR      arch/riscv/kernel/vdso/built-in.a
      AR      arch/riscv/kernel/built-in.a
      AR      arch/riscv/built-in.a
      GEN     .version
      CHK     include/generated/compile.h
      UPD     include/generated/compile.h
      CC      init/version.o
      AR      init/built-in.a
      LD      vmlinux.o
    
    The reason is "Any target that utilizes if_changed must be listed in
    $(targets), otherwise the command line check will fail, and the target
    will always be built" as explained by Documentation/kbuild/makefiles.rst
    
    Fix this build bug by adding vdso-syms.S to $(targets)
    
    At the same time, there are two trivial clean up modifications:
    
    - the vdso-dummy.o is not needed any more after so remove it.
    
    - vdso.lds is a generated file, so it should be prefixed with
      $(obj)/ instead of $(src)/
    
    Fixes: c2c81bb2f691 ("RISC-V: Fix the VDSO symbol generaton for binutils-2.35+")
    Cc: stable@xxxxxxxxxxxxxxx
    Signed-off-by: Jisheng Zhang <jszhang@xxxxxxxxxx>
    Signed-off-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile
index ca2b40dfd24b..24d936c147cd 100644
--- a/arch/riscv/kernel/vdso/Makefile
+++ b/arch/riscv/kernel/vdso/Makefile
@@ -23,7 +23,7 @@ ifneq ($(c-gettimeofday-y),)
 endif
 
 # Build rules
-targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-dummy.o
+targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-syms.S
 obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
 
 obj-y += vdso.o vdso-syms.o
@@ -41,7 +41,7 @@ KASAN_SANITIZE := n
 $(obj)/vdso.o: $(obj)/vdso.so
 
 # link rule for the .so file, .lds has to be first
-$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
 	$(call if_changed,vdsold)
 LDFLAGS_vdso.so.dbg = -shared -s -soname=linux-vdso.so.1 \
 	--build-id=sha1 --hash-style=both --eh-frame-hdr