The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 6e70aef598a2779389be297afda9f61b3d19759f
Gitweb: https://git.kernel.org/tip/6e70aef598a2779389be297afda9f61b3d19759f
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Tue, 11 Aug 2026 10:44:38 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 11 Aug 2026 10:44:38 +02:00
objtool/headers: Sync tools/include/linux/objtool_types.h with include/linux/objtool_types.h
Sync up the kernel and tooling headers to fix this build warning:
Warning: Kernel ABI header at 'tools/include/linux/objtool_types.h' differs from latest version at 'include/linux/objtool_types.h'
Fixes: 6e5716b187fa ("objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files")
Cc: Thomas Huth <thuth@redhat.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/include/linux/objtool_types.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/include/linux/objtool_types.h b/tools/include/linux/objtool_types.h
index c6def40..c24e9ea 100644
--- a/tools/include/linux/objtool_types.h
+++ b/tools/include/linux/objtool_types.h
@@ -2,7 +2,7 @@
#ifndef _LINUX_OBJTOOL_TYPES_H
#define _LINUX_OBJTOOL_TYPES_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -18,7 +18,7 @@ struct unwind_hint {
u8 signal;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can result in