diff options
author | 2024-10-24 10:58:51 -0700 | |
---|---|---|
committer | 2024-10-25 06:18:43 -0700 | |
commit | 5f153a692bacc295f213e2c632ca557979fad7be (patch) | |
tree | b0cf3bb8cf422a9a61fcb8d4106236c8c21e4d70 | |
parent | riscv: Remove duplicated GET_RM (diff) | |
parent | riscv: vdso: Prevent the compiler from inserting calls to memset() (diff) | |
download | wireguard-linux-5f153a692bacc295f213e2c632ca557979fad7be.tar.xz wireguard-linux-5f153a692bacc295f213e2c632ca557979fad7be.zip |
Merge commit 'bf40167d54d5' into fixes
This fix is part of a series on for-next, but it fixes broken builds so
I'm picking it up as a fix.
* commit 'bf40167d54d5':
riscv: vdso: Prevent the compiler from inserting calls to memset()
-rw-r--r-- | arch/riscv/kernel/vdso/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile index 960feb1526ca..3f1c4b2d0b06 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -18,6 +18,7 @@ obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o ccflags-y := -fno-stack-protector ccflags-y += -DDISABLE_BRANCH_PROFILING +ccflags-y += -fno-builtin ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) |