diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-28 15:53:30 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-28 15:53:30 -0800 |
commit | aae5ab854e38151e69f261dbf0e3b7e396403178 (patch) | |
tree | 8d4059febb47ce4972aaabfa4297d6ff3739f387 /arch/riscv/include/asm | |
parent | 45e885c439e825c19f3a51e46ef8210984bc0a9c (diff) | |
parent | 30aca1bacb398dec6c1ed5eeca33f355bd7b6203 (diff) | |
download | linux-aae5ab854e38151e69f261dbf0e3b7e396403178.tar.gz linux-aae5ab854e38151e69f261dbf0e3b7e396403178.tar.bz2 linux-aae5ab854e38151e69f261dbf0e3b7e396403178.zip |
Merge tag 'riscv-for-linus-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
"I've collected a handful of fixes over the past few weeks:
- A fix to un-break the build-id argument to the vDSO build, which is
necessary for the LLVM linker.
- A fix to initialize the jump label subsystem, without which it (and
all the stuff that uses it) doesn't actually function.
- A fix to include <asm/barrier.h> from <vdso/processor.h>, without
which some drivers won't compile"
* tag 'riscv-for-linus-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
RISC-V: fix barrier() use in <vdso/processor.h>
RISC-V: Add missing jump label initialization
riscv: Explicitly specify the build id style in vDSO Makefile again
Diffstat (limited to 'arch/riscv/include/asm')
-rw-r--r-- | arch/riscv/include/asm/vdso/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/riscv/include/asm/vdso/processor.h b/arch/riscv/include/asm/vdso/processor.h index 82a5693b1861..134388cbaaa1 100644 --- a/arch/riscv/include/asm/vdso/processor.h +++ b/arch/riscv/include/asm/vdso/processor.h @@ -4,6 +4,8 @@ #ifndef __ASSEMBLY__ +#include <asm/barrier.h> + static inline void cpu_relax(void) { #ifdef __riscv_muldiv |