From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39791C388F2 for ; Mon, 2 Nov 2020 01:08:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DB6032145D for ; Mon, 2 Nov 2020 01:08:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="V1FlTCia" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB6032145D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7C1116B005D; Sun, 1 Nov 2020 20:08:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 747A96B0098; Sun, 1 Nov 2020 20:08:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E84C6B0099; Sun, 1 Nov 2020 20:08:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0025.hostedemail.com [216.40.44.25]) by kanga.kvack.org (Postfix) with ESMTP id 2D82E6B005D for ; Sun, 1 Nov 2020 20:08:13 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D18AC180AD804 for ; Mon, 2 Nov 2020 01:08:12 +0000 (UTC) X-FDA: 77437692024.16.cast23_5506ee6272ab Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id AB3A5100E690B for ; Mon, 2 Nov 2020 01:08:12 +0000 (UTC) X-HE-Tag: cast23_5506ee6272ab X-Filterd-Recvd-Size: 3354 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 01:08:12 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 06D0A22272; Mon, 2 Nov 2020 01:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604279291; bh=ZMKCFLLrBEvTV6BjrBuoGB+YdyTQXDnnp7wqyi9Lo4w=; h=Date:From:To:Subject:In-Reply-To:From; b=V1FlTCiaVuAdxdlQchvVMn5dPeWVhZiu/DQSdj49rJMP/ImFWURhEgCCHScQSyJYV 6LmF09awvlwYqogXdTd3LGj4q1heMOYKA2Cgk4R3OZO7PrsZte5ZAApg+sg2G746nw DfDJDsdQcwb53r2xV9AmfAoWiK8oAwmgHkLwJnpc= Date: Sun, 01 Nov 2020 17:08:10 -0800 From: Andrew Morton To: akpm@linux-foundation.org, hch@lst.de, linux-mm@kvack.org, lukas.bulwahn@gmail.com, mm-commits@vger.kernel.org, penguin-kernel@i-love.sakura.ne.jp, rdna@fb.com, torvalds@linux-foundation.org, viro@zeniv.linux.org.uk Subject: [patch 15/15] kernel/hung_task.c: make type annotations consistent Message-ID: <20201102010810.fKUP5FhiG%akpm@linux-foundation.org> In-Reply-To: <20201101170656.48abbd5e88375219f868af5e@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Lukas Bulwahn Subject: kernel/hung_task.c: make type annotations consistent Commit 32927393dc1c ("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. Link: https://lkml.kernel.org/r/20201028130541.20320-1-lukas.bulwahn@gmail.com Signed-off-by: Lukas Bulwahn Cc: Christoph Hellwig Cc: Tetsuo Handa Cc: Al Viro Cc: Andrey Ignatov Signed-off-by: Andrew Morton --- kernel/hung_task.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/kernel/hung_task.c~kernel-hung_taskc-make-type-annotations-consistent +++ a/kernel/hung_task.c @@ -225,8 +225,7 @@ static long hung_timeout_jiffies(unsigne * 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; _