diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2021-05-20 14:43:33 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2021-05-20 14:43:33 -1000
commit921dd23597704b31fb3b51c7eae9cf3022846625 (patch)
parenta0d8b0eda3107f5dda4a56623164ced833574ead (diff)
parent976aac5f882989e4f6c1b3a7224819bf0e801c6a (diff)
Merge branch 'urgent.2021.05.20a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull kcsan fix from Paul McKenney: "Fix for a regression introduced in this merge window by commit e36299efe7d7 ("kcsan, debugfs: Move debugfs file creation out of early init"). The regression is not easy to trigger, requiring a KCSAN build using clang with CONFIG_LTO_CLANG=y. The fix is to simply make the kcsan_debugfs_init() function's type initcall-compatible. This has been posted to the relevant mailing lists:" * 'urgent.2021.05.20a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu: kcsan: Fix debugfs initcall return type
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/kcsan/debugfs.c b/kernel/kcsan/debugfs.c
index c1dd02f3be8b..e65de172ccf7 100644
--- a/kernel/kcsan/debugfs.c
+++ b/kernel/kcsan/debugfs.c
@@ -266,9 +266,10 @@ static const struct file_operations debugfs_ops =
.release = single_release
-static void __init kcsan_debugfs_init(void)
+static int __init kcsan_debugfs_init(void)
debugfs_create_file("kcsan", 0644, NULL, NULL, &debugfs_ops);
+ return 0;

Privacy Policy