From patchwork Mon Feb 19 10:13:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 128788 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3330592ljc; Mon, 19 Feb 2018 02:15:01 -0800 (PST) X-Google-Smtp-Source: AH8x227bxHdrAIzwa+DP3XUgNwgGegBCLal2Cbl9Oe+c+nLkUIVjdHYJV0TUycJszgjj4FNvkXHV X-Received: by 2002:a17:902:7682:: with SMTP id m2-v6mr2907869pll.185.1519035301816; Mon, 19 Feb 2018 02:15:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519035301; cv=none; d=google.com; s=arc-20160816; b=1I/NZbYFnfDmZP2LgTrn63CiIJLfKZH2rQUCj26LiicufKcYo947qaNhkdU4m0JnAv DYKABv6rBAOONERnF4D94syYt0QYIXxKM6YZbZ5W/UeFPz1vm7Ni8cOGMXma7SS1mxvO yEbI1X9VJQ8+nY3mFKXioPoQEbIaKd8rptbJtVk6aVA1LH14hJtyaBxLYiAowud9nzWA M5j+MPvhXvmdPLFvA722N73G6Y4XsZ21GrTheyVsxItio4chBFOMF+sqe7XGAy1YOpyR +4zKQ92wPZVbN8yOqZxo4ZiAmVlRqZTKT/Pqu+IoeoC5sreIIuIBLXhyJSvBvhmpLygk 9Aag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=3EXdaR8klswLR8IkrfgcsX4O2930oPg7dMD1Fm2rf48=; b=DSX/IeCjHycEDbQuXNanelb02mPUR5fi7a9Re7MXtNZMQyJTUad0C2AvgSx1/kze2a cyT0xO2yp9zYUbj1rnt14xCMmQQt+Px7TKp0NM9R2L3Qme8seEFIj/QPhtPvZP3Ar4c/ hKQEMV4BmhxIHGR+gXWWn99zb43D6ALenXk1cpV+ll/oWqV/1vR5tAHeN4eyg5ohbXMy YpC9QZj9OrbfasixzVBBxMp2Un6R/dN5YZqhaCGEDpm/T6dO+f69ZCniO3OJ3EDavtcE Oo7SJmsN18nlyDwAaBLcM78ixayN1EQQg6i8kj1niuz6GG9XQWsQ6+l9yXES5ZXfgaWT N7YQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l36-v6si3835885plg.667.2018.02.19.02.15.01; Mon, 19 Feb 2018 02:15:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752596AbeBSKOq (ORCPT + 28 others); Mon, 19 Feb 2018 05:14:46 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:57989 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474AbeBSKOn (ORCPT ); Mon, 19 Feb 2018 05:14:43 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mf6wH-1f7sqX3Ls9-00OZuh; Mon, 19 Feb 2018 11:14:40 +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.9-stable 4/9] binfmt_elf: compat: avoid unused function warning Date: Mon, 19 Feb 2018 11:13:23 +0100 Message-Id: <20180219101343.2922561-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180219101343.2922561-1-arnd@arndb.de> References: <20180219101343.2922561-1-arnd@arndb.de> X-Provags-ID: V03:K0:a7vjXUQbrfLAs8RrB/FR6oKJwbxpj3OpY3fqd2uZTcuqz0pmMmO uCeETK/I3J/yklsDp5aZM5vkmgVzNK6BYygow0iowzqxca11SQmDUs7RuXdIayEvQVy9iKy B/eEqCoc/a8HSX/jNMoeCyq8cyoMiA8AHlidWvGaWXqr+gz0gsZA1bvJxLEIBqQzvWNxKsk y4oKoMH3Gtz6w6Hdv+fhw== X-UI-Out-Filterresults: notjunk:1; V01:K0:S7avwsTmh4Q=:DnZ0WXJgMnPCo+nCmBCX0M xfZTMdg3l0qCJAnseO4sF7IMg36CC5Q5U9taziUEIgiQeWVTFc70QFnZbonkv6mDfoAae5AZy xK4FDWXXWN0qyKYfIghuVIRQIKbqPitdFeNav+oQDpiiw4487LNS+xm1xvldogRrLkuBX4Dfs famku1grCL3y6ZBvQJao5cIveY+hD9BC3pRrfSjyYiKXi7Mu/u1XL1le/LuyykUBkDCxPmpzQ LvjBUiI7B8rQlO7Vy5DkzwVXaZ7WnBrqExP3Q6tvka7GO5Db4Oz2oGKJAl3An5fpFZh5Bv3Zo xWDkNK/1625AInuwwjaF2UaHrRErdpnKVWE0ZFpLBMpF6oFnc3OjEQrDkBv/ScBCA4/YDWgK1 M3VUMF3/F/Sp9y/Pi+7Otkt4lDANmrmVMb3C0sKyMjJ9H2CkD8owNPVqEhnr6iVBdVD95MMQ8 NfNe79sokfqX3HBsaRuG72E43pq47h4PKprPIvAkRwhhYMJYlggv7jb1mRDxWa7VCjmM17sHm h7ivSoeS5z6VkWDS90v4fHsYqnutusTUs77wflSqO36wh2B9KR6OHpvbkocJe03q1U4Tt6xVn mRAaGotAwEfeIpwLM3GDSVvctnSRTeJZEIkx7KF04y4tTtIjvY2SGXGUiiHZCvcgdzqIW2OsH 068tDTe3rVD+fRtYeiMVhoJ5cDK8GbkbW+FfA6CSqPqeoTrP0pl5C7xwagV26OXv3vdkPCGfd AfblSubCEVe6S/iaJ8l/h1W3Cq3o6e5zlY4JgQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(+) -- 2.9.0 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