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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 D6FD8C433DF for ; Thu, 2 Jul 2020 12:42:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A52272088E for ; Thu, 2 Jul 2020 12:42:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593693743; bh=GmaO+M/a1fel3w8zVOsBwLIVCGwMuG1WwQvgaJ/HfX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R930IDtakThJqGYgbfWtntiS9sleE1fvxLbrtGPVfI1k0+I+aMRP/cHO39h8b2uUF iRuZOVwhx54nrh+lox323bxaPw975KxmGyykRNFyr+RcbYt0mC0C39OCBvlE3TujLS f0wkXKifVYBQ9EjDcpPkDdsCszdfHOYnSuWXtSek= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729036AbgGBMmX (ORCPT ); Thu, 2 Jul 2020 08:42:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:48236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728808AbgGBMmW (ORCPT ); Thu, 2 Jul 2020 08:42:22 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2615020885; Thu, 2 Jul 2020 12:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593693742; bh=GmaO+M/a1fel3w8zVOsBwLIVCGwMuG1WwQvgaJ/HfX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EIll8EK3BJ9T7RXtDs3jecyJeUcWT/jt+78Vl8fl9C39ctG+dGgrjtfTX7m7XEdmn rMIuAQXPmUXMhzfbVhar0Iy3OLedFSIB+oW5SH5hG7Yubg2Ia3Cb2SLVrIFP1vLJgl sCONdQLgf8C6/REykyzYy1IhJGs22qm2fy8eaFM4= From: Masami Hiramatsu To: stable@vger.kernel.org Cc: Sergey Senozhatsky , Changbin Du , Jiri Olsa , Arnaldo Carvalho de Melo , mhiramat@kernel.org Subject: [PATCH for 4.4.y 5/5] tools/lib/subcmd/pager.c: do not alias select() params Date: Thu, 2 Jul 2020 21:42:18 +0900 Message-Id: <159369373879.82195.6388245474703207993.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <159369369207.82195.5763005209795799082.stgit@devnote2> References: <159369369207.82195.5763005209795799082.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sergey Senozhatsky commit dfbc3c6cb747c074aa2ba0a10bbeea588d6dfda6 upstream. [ Change applied file from tools/lib/subcmd/pager.c to tools/perf/util/pager.c ] Use a separate fd set for select()-s exception fds param to fix the following gcc warning: pager.c:36:12: error: passing argument 2 to restrict-qualified parameter aliases with argument 4 [-Werror=restrict] select(1, &in, NULL, &in, NULL); ^~~ ~~~ Link: http://lkml.kernel.org/r/20180101105626.7168-1-sergey.senozhatsky@gmail.com Signed-off-by: Sergey Senozhatsky Cc: Arnaldo Carvalho de Melo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- tools/perf/util/pager.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/pager.c b/tools/perf/util/pager.c index 53ef006a951c..b301d779c4af 100644 --- a/tools/perf/util/pager.c +++ b/tools/perf/util/pager.c @@ -16,10 +16,13 @@ static void pager_preexec(void) * have real input */ fd_set in; + fd_set exception; FD_ZERO(&in); + FD_ZERO(&exception); FD_SET(0, &in); - select(1, &in, NULL, &in, NULL); + FD_SET(0, &exception); + select(1, &in, NULL, &exception, NULL); setenv("LESS", "FRSX", 0); }