summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/vdso32_wrapper.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-06 15:14:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-06 15:14:39 -0800
commitf06279ea1908b9cd2d22645dc6d492e612b82744 (patch)
tree53f096d71ec6c85359cb056f044c0a127914fad8 /arch/powerpc/kernel/vdso32_wrapper.S
parent4a7859ea098bdf9282cdc34e859c3b185fdb31a4 (diff)
parent24321ac668e452a4942598533d267805f291fdc9 (diff)
downloadlwn-f06279ea1908b9cd2d22645dc6d492e612b82744.tar.gz
lwn-f06279ea1908b9cd2d22645dc6d492e612b82744.zip
Merge tag 'powerpc-5.11-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: - A fix for a change we made to __kernel_sigtramp_rt64() which confused glibc's backtrace logic, and also changed the semantics of that symbol, which was arguably an ABI break. - A fix for a stack overwrite in our VSX instruction emulation. - A couple of fixes for the Makefile logic in the new C VDSO. Thanks to Masahiro Yamada, Naveen N. Rao, Raoni Fassina Firmino, and Ravi Bangoria. * tag 'powerpc-5.11-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/64/signal: Fix regression in __kernel_sigtramp_rt64() semantics powerpc/vdso64: remove meaningless vgettimeofday.o build rule powerpc/vdso: fix unnecessary rebuilds of vgettimeofday.o powerpc/sstep: Fix array out of bound warning
Diffstat (limited to 'arch/powerpc/kernel/vdso32_wrapper.S')
-rw-r--r--arch/powerpc/kernel/vdso32_wrapper.S14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/vdso32_wrapper.S b/arch/powerpc/kernel/vdso32_wrapper.S
new file mode 100644
index 000000000000..3f5ef035b0a9
--- /dev/null
+++ b/arch/powerpc/kernel/vdso32_wrapper.S
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/linkage.h>
+#include <asm/page.h>
+
+ __PAGE_ALIGNED_DATA
+
+ .globl vdso32_start, vdso32_end
+ .balign PAGE_SIZE
+vdso32_start:
+ .incbin "arch/powerpc/kernel/vdso32/vdso32.so.dbg"
+ .balign PAGE_SIZE
+vdso32_end:
+
+ .previous