aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/init.h
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2022-09-08 14:54:57 -0700
committerKees Cook <keescook@chromium.org>2022-09-26 10:13:15 -0700
commit5659b598b4dcb352b1a567c55fc5a658bc80076c (patch)
tree9e941833141547dc995c3008b9e3cffeae756681 /include/linux/init.h
parenttreewide: Drop WARN_ON_FUNCTION_MISMATCH (diff)
downloadlinux-dev-5659b598b4dcb352b1a567c55fc5a658bc80076c.tar.xz
linux-dev-5659b598b4dcb352b1a567c55fc5a658bc80076c.zip
treewide: Drop __cficanonical
CONFIG_CFI_CLANG doesn't use a jump table anymore and therefore, won't change function references to point elsewhere. Remove the __cficanonical attribute and all uses of it. Note that the Clang definition of the attribute was removed earlier, just clean up the no-op definition and users. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Tested-by: Kees Cook <keescook@chromium.org> Tested-by: Nathan Chancellor <nathan@kernel.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20220908215504.3686827-16-samitolvanen@google.com
Diffstat (limited to 'include/linux/init.h')
-rw-r--r--include/linux/init.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/init.h b/include/linux/init.h
index 88f2964097f5..a0a90cd73ebe 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -220,8 +220,8 @@ extern bool initcall_debug;
__initcall_name(initstub, __iid, id)
#define __define_initcall_stub(__stub, fn) \
- int __init __cficanonical __stub(void); \
- int __init __cficanonical __stub(void) \
+ int __init __stub(void); \
+ int __init __stub(void) \
{ \
return fn(); \
} \