diff options
| author | Palmer Dabbelt <palmer@rivosinc.com> | 2024-10-24 10:58:51 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2024-10-25 06:18:43 -0700 |
| commit | 5f153a692bacc295f213e2c632ca557979fad7be (patch) | |
| tree | b0cf3bb8cf422a9a61fcb8d4106236c8c21e4d70 /arch/riscv | |
| parent | 164f66de6bb6ef454893f193c898dc8f1da6d18b (diff) | |
| parent | bf40167d54d55d4b54d0103713d86a8638fb9290 (diff) | |
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()
Diffstat (limited to 'arch/riscv')
| -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) |