From patchwork Mon May 24 15:26:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 446464 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2b0d:0:0:0:0 with SMTP id gc13csp3790969ejc; Mon, 24 May 2021 08:59:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwK9iJgwN2oFE0j3ElyvFlS4Eqxx5Layl6l9yr6PcQjbPRRnm7n1pTo41nV1SQB7T7MrVBJ X-Received: by 2002:a02:3505:: with SMTP id k5mr26186609jaa.123.1621871979318; Mon, 24 May 2021 08:59:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621871979; cv=none; d=google.com; s=arc-20160816; b=mGSFGPO2Rk+nnlAsf2OiGyecE58wVUNO9F/BftW7VkeFtGyFb58pPhTDxMPO9tFKxX 85ALBIx7KFuqG66kxtyzy/Kx/cLdiCfKB5yKBsU+JOy/ZpAzg4gpkI7dcy+1p2JTY7eD REXRlL9rYPq1IXmsWPyEoZypCQZpUAIHXoWo6cmX4JXxj2zZN8v5z7qJ4RELzWU84h+Q RcNyo48Mxs8dMb6PsQP0XXQHEnaCRpvuZFB8D3zvXuSUE39zS7SWDCZDxN3Gqj6CXaQ7 jrSL1Me214IhcQBhfCXx7CbwIyIl9vblwjxePIwrZ5x+FXMRE5eg6SwjTuRe3pwBeqEN CM3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=i4M1rimmnjquHBFo6SXnyeF45F6bbZStigwxCZ7P0fU=; b=N2Pmo2lx8Izhwc60UIe7BkF+ggKQGy5WjR4U8q64jlfiYKfSbiag91xcqRrmO4J+9T AqmXlOC8LZP9HF/pLuRAzSL9r+VPJ9gklvoW7cwbXtdqYPM7Ui3cmQ9Xa8F1ftRNy09x N3iuEzAKCmRNLsO+9kdcWqx7VJi3VdI+cKzlJhEoEKohpPqePt98F1NxP7NneZ7mrPvr dsyY2ZmRnoBwHqmgtvb4DILRKXXw+HSlSUsBRI/O6BAeaF0kxHywyWTA6E2eY+N1l6ah 4gPv18uKJXTIXEmCvvZGwNbPiGqtYWSj49zGsvFOd351C9W/liu4DPiEVrBFrOIf+TtI HEgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hPjj0ok6; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g23si9683775iom.5.2021.05.24.08.59.39; Mon, 24 May 2021 08:59:39 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hPjj0ok6; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236008AbhEXQBC (ORCPT + 12 others); Mon, 24 May 2021 12:01:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:45006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235751AbhEXQAJ (ORCPT ); Mon, 24 May 2021 12:00:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9FDF561465; Mon, 24 May 2021 15:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621871151; bh=5mib4CZtgWgB8CCMyhXcqN7oYJH/iNBMul8UDElOprg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hPjj0ok6ZbgCTFfYRUD2ygl8ZwvU80NiXVbR9RUA0FdN6AvKFd860vqNqvHK6NR0L 3TSYWv0f2NcRuF5LkMCq3yKP4hdPHGd0IyEmdWCaa+TOkXxRnTqsjcLkLfJtCPdSnZ T9BstwoT2sxVNTyZjcqv8986TQjpyj67qcuYLpSY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marco Elver , Nathan Chancellor , Miguel Ojeda , Arnd Bergmann , "Paul E. McKenney" Subject: [PATCH 5.12 095/127] kcsan: Fix debugfs initcall return type Date: Mon, 24 May 2021 17:26:52 +0200 Message-Id: <20210524152338.068283646@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524152334.857620285@linuxfoundation.org> References: <20210524152334.857620285@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 976aac5f882989e4f6c1b3a7224819bf0e801c6a upstream. clang with CONFIG_LTO_CLANG points out that an initcall function should return an 'int' due to the changes made to the initcall macros in commit 3578ad11f3fb ("init: lto: fix PREL32 relocations"): kernel/kcsan/debugfs.c:274:15: error: returning 'void' from a function with incompatible result type 'int' late_initcall(kcsan_debugfs_init); ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~ include/linux/init.h:292:46: note: expanded from macro 'late_initcall' #define late_initcall(fn) __define_initcall(fn, 7) Fixes: e36299efe7d7 ("kcsan, debugfs: Move debugfs file creation out of early init") Cc: stable Reviewed-by: Greg Kroah-Hartman Reviewed-by: Marco Elver Reviewed-by: Nathan Chancellor Reviewed-by: Miguel Ojeda Signed-off-by: Arnd Bergmann Signed-off-by: Paul E. McKenney Signed-off-by: Greg Kroah-Hartman --- kernel/kcsan/debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/kcsan/debugfs.c +++ b/kernel/kcsan/debugfs.c @@ -261,9 +261,10 @@ static const struct file_operations debu .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);