summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorDavid Gow <davidgow@google.com>2023-07-04 11:30:21 +0300
committerRichard Weinberger <richard@nod.at>2023-08-26 23:38:49 +0300
commit760ee8f83825f6b6ee711bb50b61a2e9a89209a0 (patch)
treed30cb0aea8c8ed3e228fb2944ce1431f521fb68f /include/asm-generic
parent11ae290ee6b824607cf5a837d1e893442ed0ba88 (diff)
downloadlinux-760ee8f83825f6b6ee711bb50b61a2e9a89209a0.tar.xz
asm-generic: current: Don't include thread-info.h if building asm
asm/current.h is included by some assembly files (either directly, or indirectly). This works on some architectures (such as x86), as their implementation of current.h is careful to not include any C, but the asm-generic version includes linux/thread-info.h unconditionally, which leads to errors when either C code or non-asm-compatible preprocessor directives are included. Just wrap the contents behind an #ifndef __ASSEMBLY__ to avoid any C code making its way in. Signed-off-by: David Gow <davidgow@google.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/current.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/current.h b/include/asm-generic/current.h
index 3a2e224b9fa0..9c2aeecbd05a 100644
--- a/include/asm-generic/current.h
+++ b/include/asm-generic/current.h
@@ -2,9 +2,11 @@
#ifndef __ASM_GENERIC_CURRENT_H
#define __ASM_GENERIC_CURRENT_H
+#ifndef __ASSEMBLY__
#include <linux/thread_info.h>
#define get_current() (current_thread_info()->task)
#define current get_current()
+#endif
#endif /* __ASM_GENERIC_CURRENT_H */