projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
objtool: Add CONFIG_OBJTOOL
[linux-2.6-microblaze.git]
/
arch
/
x86
/
include
/
asm
/
jump_label.h
diff --git
a/arch/x86/include/asm/jump_label.h
b/arch/x86/include/asm/jump_label.h
index
0449b12
..
3ce0e67
100644
(file)
--- a/
arch/x86/include/asm/jump_label.h
+++ b/
arch/x86/include/asm/jump_label.h
@@
-20,7
+20,7
@@
_ASM_PTR "%c0 + %c1 - .\n\t" \
".popsection \n\t"
_ASM_PTR "%c0 + %c1 - .\n\t" \
".popsection \n\t"
-#ifdef CONFIG_
STACK_VALIDATION
+#ifdef CONFIG_
OBJTOOL
static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
{
static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
{
@@
-34,7
+34,7
@@
l_yes:
return true;
}
return true;
}
-#else
+#else
/* !CONFIG_OBJTOOL */
static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch)
{
static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch)
{
@@
-48,7
+48,7
@@
l_yes:
return true;
}
return true;
}
-#endif /*
STACK_VALIDATION
*/
+#endif /*
CONFIG_OBJTOOL
*/
static __always_inline bool arch_static_branch_jump(struct static_key * const key, const bool branch)
{
static __always_inline bool arch_static_branch_jump(struct static_key * const key, const bool branch)
{