aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/cache.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.com>2025-07-31 22:36:25 +0200
committerJiri Kosina <jkosina@suse.com>2025-07-31 22:36:25 +0200
commite9ef810dfee7a2227da9d423aecb0ced35faddbe (patch)
tree52befbbbeacbd9340f90884dee840be3f492d3e1 /arch/sh/include/asm/cache.h
parentselftests/hid: add a test case for the recent syzbot underflow (diff)
parentHID: amd_sfh: Enable operating mode (diff)
downloadlinux-e9ef810dfee7a2227da9d423aecb0ced35faddbe.tar.gz
linux-e9ef810dfee7a2227da9d423aecb0ced35faddbe.zip
Merge branch 'for-6.17/amd-sfh' into for-linus
- add support for operating modes (Basavaraj Natikar)
Diffstat (limited to 'arch/sh/include/asm/cache.h')
-rw-r--r--arch/sh/include/asm/cache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
index b38dbc975581..e7ac9c950275 100644
--- a/arch/sh/include/asm/cache.h
+++ b/arch/sh/include/asm/cache.h
@@ -22,7 +22,7 @@
#define __read_mostly __section(".data..read_mostly")
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct cache_info {
unsigned int ways; /* Number of cache ways */
unsigned int sets; /* Number of cache sets */
@@ -48,5 +48,5 @@ struct cache_info {
unsigned long flags;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_SH_CACHE_H */