summaryrefslogtreecommitdiff
path: root/arch/arc/include/asm/atomic.h
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2025-07-15 18:34:10 +0300
committerChen-Yu Tsai <wens@csie.org>2025-07-15 18:34:10 +0300
commitca5ad734d30f30a577f705926d6e16a87513a2a7 (patch)
treeb5fb169a86ac59892bd3b60c2df13e8a7cef360d /arch/arc/include/asm/atomic.h
parent082c6a2d06c0831d236760a29953355845eee988 (diff)
parentf99d4fccd2185176baf4ecac9a49d280fc62b953 (diff)
downloadlinux-ca5ad734d30f30a577f705926d6e16a87513a2a7.tar.xz
Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm into sunxi/dt-for-6.17
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Diffstat (limited to 'arch/arc/include/asm/atomic.h')
-rw-r--r--arch/arc/include/asm/atomic.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 592d7fffc223..e615c42b93ba 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_ATOMIC_H
#define _ASM_ARC_ATOMIC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/compiler.h>
@@ -31,6 +31,6 @@
#include <asm/atomic64-arcv2.h>
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif