Commit 3b70ae4f authored Nov 01, 2020 by Lukas Bulwahn Committed by Linus Torvalds Nov 02, 2020

kernel/hung_task.c: make type annotations consistent



Commit 32927393 ("sysctl: pass kernel pointers to ->proc_handler")
removed various __user annotations from function signatures as part of
its refactoring.

It also removed the __user annotation for proc_dohung_task_timeout_secs()
at its declaration in sched/sysctl.h, but not at its definition in
kernel/hung_task.c.

Hence, sparse complains:

  kernel/hung_task.c:271:5: error: symbol 'proc_dohung_task_timeout_secs' redeclared with different type (incompatible argument 3 (different address spaces))

Adjust the annotation at the definition fitting to that refactoring to make
sparse happy again, which also resolves this warning from sparse:

  kernel/hung_task.c:277:52: warning: incorrect type in argument 3 (different address spaces)
  kernel/hung_task.c:277:52:    expected void *
  kernel/hung_task.c:277:52:    got void [noderef] __user *buffer

No functional change. No change in object code.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrey Ignatov <rdna@fb.com>
Link: https://lkml.kernel.org/r/20201028130541.20320-1-lukas.bulwahn@gmail.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent afabdf33

kernel/hung_task.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -225,8 +225,7 @@ static long hung_timeout_jiffies(unsigned long last_checked,
		* Process updating of timeout sysctl
		*/
		int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
		void __user *buffer,
		size_t lenp, loff_t ppos)
		void buffer, size_t lenp, loff_t *ppos)
		{
		int ret;

Admin message