From patchwork Tue Feb 20 11:54:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10229927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5560B602A7 for ; Tue, 20 Feb 2018 12:05:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4718D28646 for ; Tue, 20 Feb 2018 12:05:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39A9328653; Tue, 20 Feb 2018 12:05:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B55F928646 for ; Tue, 20 Feb 2018 12:05:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751740AbeBTL6E (ORCPT ); Tue, 20 Feb 2018 06:58:04 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:49671 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751678AbeBTL6C (ORCPT ); Tue, 20 Feb 2018 06:58:02 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LjbM8-1eCpvr3nzM-00bXEz; Tue, 20 Feb 2018 12:58:00 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Greg KH , linux-kernel@vger.kernel.org, Arnd Bergmann , Alexander Viro , linux-fsdevel@vger.kernel.org Subject: [4.4-stable 05/22] binfmt_elf: compat: avoid unused function warning Date: Tue, 20 Feb 2018 12:54:52 +0100 Message-Id: <20180220115527.1806578-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220115527.1806578-1-arnd@arndb.de> References: <20180220115527.1806578-1-arnd@arndb.de> X-Provags-ID: V03:K0:AQmQf7SU2ti+TA1dVDcOP0BrHcYYG4evrZ/sdFZm0KTWOpgYV7Z a6tyucQmqG+l63+TLuoFpUINwxUavsNI+66m2ej7sysNljkYzwVS8bwiv2+tuSww0GBSL+N M4Jcd2ml6ks3wlh9t8s2INe0tzF0uGqyjekZUsf6mIBO6oGUhmjScBfZzjfoGRUMQvM3aRl jwe2+nlsxGHLBxO1DobEA== X-UI-Out-Filterresults: notjunk:1; V01:K0:BbghsELhevc=:2zB/VW8D21kisme6mBC0x3 raryyLwCn++w8c598KsLBvWDVfIKl6L9hgcDEoBjDmytDq/w19a1vccLhYQozQKvaZtTq8r+o Zd/k80DGooDW97KnSf90SweWuuHz97MB1P/bVHeKUolP5nGZkQq3leDhge0ba2LLynl1iLOHf B3aUH8jRTQCtReMXIFUAQnrnDJOwJ0FCORwfnOry65/MQE2ZzG05hkAkYGh9IIaUW6OSnhvxd mdl45APJDYVayudVvGdWvtowgUwGvvZmfS5L2UhrsdOi9Sn/XSVQ/n/oCY2uGASnuqCRdJPQf 2EdFJCJWV0I/+u0y+YuRlHbYwTBXKYKiFyxgppShru0qdwE+hB8tvY2UGlMeA9udR+pPCl6oN sTWCxdkWRRPYkRlP8nKFXNNfa+c9Do+eRenKBZIYkMlxGrKvVEUxYvZamA/P/67k7lYRqwFy/ T/2XwouGK6r3t1xAnWKmFtWGk5M6eOnX/FfdBeGBlg1qrV5vIvmb/vWibdVtjk6dk1rQpCZfc JSLZmwk5MnMF+zMEUEGc1ELgQSVORv30xAI6MXqYXTnhYKRyFtCM25MRbcG9YoDiW3jnjXJuC uHExB35utVIHCLiubCw+OQwJCp3RIKqzuwNO5npK+vHLlOMYMsXsWNKpQg2qRYFdyFRcmTiGD TkCPyQiEj4u3yvCAxVROZQQRp/ObplpR3CkwCTAVqeY31kfS3DMPcl0vXd+haGpTJ6MrkwGw1 YoJ3VCQoY7DBP3AvSCA7itrdMWA++gNRbToDTQ== Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_ELF_CORE is disabled, we get a harmless warning in the compat version of binfmt_elf: fs/compat_binfmt_elf.c:58:13: error: 'cputime_to_compat_timeval' defined but not used [-Werror=unused-function] This was addressed in mainline Linux as part of a larger rework with commit cd19c364b313 ("fs/binfmt: Convert obsolete cputime type to nsecs"). For 4.9 and earlier, this just shuts up the warning by adding an #ifdef around the function definition. Signed-off-by: Arnd Bergmann --- fs/compat_binfmt_elf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index 4d24d17bcfc1..943be5ecfcd9 100644 --- a/fs/compat_binfmt_elf.c +++ b/fs/compat_binfmt_elf.c @@ -51,6 +51,7 @@ #define elf_prstatus compat_elf_prstatus #define elf_prpsinfo compat_elf_prpsinfo +#ifdef CONFIG_ELF_CORE /* * Compat version of cputime_to_compat_timeval, perhaps this * should be an inline in . @@ -63,6 +64,7 @@ static void cputime_to_compat_timeval(const cputime_t cputime, value->tv_sec = tv.tv_sec; value->tv_usec = tv.tv_usec; } +#endif #undef cputime_to_timeval #define cputime_to_timeval cputime_to_compat_timeval