Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: stable@vger.kernel.org
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
	Changbin Du <changbin.du@gmail.com>, Jiri Olsa <jolsa@redhat.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	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	[thread overview]
Message-ID: <159369373879.82195.6388245474703207993.stgit@devnote2> (raw)
In-Reply-To: <159369369207.82195.5763005209795799082.stgit@devnote2>

From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

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 <sergey.senozhatsky@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 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);
 }


      parent reply	other threads:[~2020-07-02 12:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-02 12:41 [PATCH for 4.4.y 0/5] tools/perf: Backport fixes for 4.4 for newer toolchain Masami Hiramatsu
2020-07-02 12:41 ` [PATCH for 4.4.y 1/5] perf probe: Fix to check blacklist address correctly Masami Hiramatsu
2020-07-02 12:41 ` [PATCH for 4.4.y 2/5] perf annotate: Use asprintf when formatting objdump command line Masami Hiramatsu
2020-07-02 12:42 ` [PATCH for 4.4.y 3/5] perf tools: Fix snprint warnings for gcc 8 Masami Hiramatsu
2020-07-02 12:42 ` [PATCH for 4.4.y 4/5] perf: Make perf able to build with latest libbfd Masami Hiramatsu
2020-07-02 12:42 ` Masami Hiramatsu [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=159369373879.82195.6388245474703207993.stgit@devnote2 \
    --to=mhiramat@kernel.org \
    --cc=acme@redhat.com \
    --cc=changbin.du@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=sergey.senozhatsky.work@gmail.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox