diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-23 10:57:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-23 10:57:03 -0700 |
| commit | 93397d3a2f1bc67eeff6a6ca0c59e628d2169f41 (patch) | |
| tree | fe2beb0a9ced76785293261c3a486ccbf4b4b4b5 /include | |
| parent | 2e3d39118460730ec007cc8a492e5add1c2a3cb9 (diff) | |
| parent | e74a6b7f3744d122ff4544f19393dfab167166ec (diff) | |
| download | linux-93397d3a2f1bc67eeff6a6ca0c59e628d2169f41.tar.gz linux-93397d3a2f1bc67eeff6a6ca0c59e628d2169f41.tar.bz2 linux-93397d3a2f1bc67eeff6a6ca0c59e628d2169f41.zip | |
Merge tag 'loongarch-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
Pull LoongArch fixes from Huacai Chen:
"Fix lockdep, fix a boot failure, fix some build warnings, fix document
links, and some cleanups"
* tag 'loongarch-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
docs/zh_CN/LoongArch: Update the links of ABI
docs/LoongArch: Update the links of ABI
LoongArch: Don't inline kasan_mem_to_shadow()/kasan_shadow_to_mem()
kasan: Cleanup the __HAVE_ARCH_SHADOW_MAP usage
LoongArch: Set all reserved memblocks on Node#0 at initialization
LoongArch: Remove dead code in relocate_new_kernel
LoongArch: Use _UL() and _ULL()
LoongArch: Fix some build warnings with W=1
LoongArch: Fix lockdep static memory detection
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kasan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 3df5499f7936..842623d708c2 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -54,7 +54,7 @@ extern p4d_t kasan_early_shadow_p4d[MAX_PTRS_PER_P4D]; int kasan_populate_early_shadow(const void *shadow_start, const void *shadow_end); -#ifndef __HAVE_ARCH_SHADOW_MAP +#ifndef kasan_mem_to_shadow static inline void *kasan_mem_to_shadow(const void *addr) { return (void *)((unsigned long)addr >> KASAN_SHADOW_SCALE_SHIFT) |