diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-30 18:28:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-30 18:28:24 +0200 |
| commit | bf85ba018f9229ce54765a62dba2dea60f7cdafb (patch) | |
| tree | 1604a16d87df072872620f74c6cdf389227906d8 /arch/riscv/Kconfig | |
| parent | Merge tag 'powerpc-5.15-6' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | riscv: Fix asan-stack clang build (diff) | |
| download | linux-bf85ba018f9229ce54765a62dba2dea60f7cdafb.tar.xz linux-bf85ba018f9229ce54765a62dba2dea60f7cdafb.zip | |
Merge tag 'riscv-for-linus-5.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
"These are pretty late, but they do fix concrete issues.
- ensure the trap vector's address is aligned.
- avoid re-populating the KASAN shadow memory.
- allow kasan to build without warnings, which have recently become
errors"
* tag 'riscv-for-linus-5.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
riscv: Fix asan-stack clang build
riscv: Do not re-populate shadow memory with kasan_populate_early_shadow
riscv: fix misalgned trap vector base address
Diffstat (limited to 'arch/riscv/Kconfig')
| -rw-r--r-- | arch/riscv/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 6a6fa9e976d5..f076cee11af6 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -163,6 +163,12 @@ config PAGE_OFFSET default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB +config KASAN_SHADOW_OFFSET + hex + depends on KASAN_GENERIC + default 0xdfffffc800000000 if 64BIT + default 0xffffffff if 32BIT + config ARCH_FLATMEM_ENABLE def_bool !NUMA |