Commit 921dd235 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'urgent.2021.05.20a' of... 

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
  e36299ef ("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
parents a0d8b0ed 976aac5f

kernel/kcsan/debugfs.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}



late_initcall(kcsan_debugfs_init);