diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-10 09:31:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-10 09:31:52 -0700 |
| commit | 95c7b07551879c8ad4d6dca10c02de46ddbf55a8 (patch) | |
| tree | 5f4b11ab614ed22013e22c4ab5ae73e9bc57b314 /arch/powerpc/kernel/Makefile | |
| parent | d5fa1dad75bef69fbff5a193b7a99ada624a0154 (diff) | |
| parent | 791f9e36599d94af5a76d3f74d04e16326761aae (diff) | |
| download | linux-95c7b07551879c8ad4d6dca10c02de46ddbf55a8.tar.gz | |
Merge tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"Some some more powerpc fixes for 5.12:
- Fix an oops triggered by ptrace when CONFIG_PPC_FPU_REGS=n
- Fix an oops on sigreturn when the VDSO is unmapped on 32-bit
- Fix vdso_wrapper.o not being rebuilt everytime vdso.so is rebuilt
Thanks to Christophe Leroy"
* tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/vdso: Make sure vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt
powerpc/signal32: Fix Oops on sigreturn with unmapped VDSO
powerpc/ptrace: Don't return error when getting/setting FP regs without CONFIG_PPC_FPU_REGS
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 6084fa499aa3..f66b63e81c3b 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -191,3 +191,7 @@ $(obj)/prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o FORCE targets += prom_init_check clean-files := vmlinux.lds + +# Force dependency (incbin is bad) +$(obj)/vdso32_wrapper.o : $(obj)/vdso32/vdso32.so.dbg +$(obj)/vdso64_wrapper.o : $(obj)/vdso64/vdso64.so.dbg |