diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-01-27 08:50:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-01-27 08:50:19 -0800 |
| commit | 816cef980d816bdb1b3121a5c406df839a85d7f5 (patch) | |
| tree | fc5a2563c930ea74d7c68322820dd04242f3dc5e /include | |
| parent | 3cbb9ce2b9e3e5799f31c53aadebaddc6aad66cb (diff) | |
| parent | f520fab580c9179bacc432f3a3bf1eada73fdfcc (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
Pull ARM updates from Russell King:
- fix typos in vfpmodule.c
- drop obsolete VFP accessor fallback for old assemblers
- add cache line identifier register accessor functions
- add cacheinfo support
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
ARM: 9440/1: cacheinfo fix format field mask
ARM: 9433/2: implement cacheinfo support
ARM: 9432/2: add CLIDR accessor functions
ARM: 9438/1: assembler: Drop obsolete VFP accessor fallback
ARM: 9437/1: vfp: Fix typographical errors in vfpmodule.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cacheinfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h index 7ad736538649..c8f4f0a0b874 100644 --- a/include/linux/cacheinfo.h +++ b/include/linux/cacheinfo.h @@ -147,7 +147,7 @@ static inline int get_cpu_cacheinfo_id(int cpu, int level) return ci ? ci->id : -1; } -#ifdef CONFIG_ARM64 +#if defined(CONFIG_ARM64) || defined(CONFIG_ARM) #define use_arch_cache_info() (true) #else #define use_arch_cache_info() (false) |