From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966687AbbBDOks (ORCPT ); Wed, 4 Feb 2015 09:40:48 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38936 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966660AbbBDOkn (ORCPT ); Wed, 4 Feb 2015 09:40:43 -0500 Date: Wed, 4 Feb 2015 06:40:13 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: torvalds@linux-foundation.org, mingo@kernel.org, namhyung@kernel.org, hpa@zytor.com, peterz@infradead.org, fweisbec@gmail.com, linux-kernel@vger.kernel.org, acme@kernel.org, tglx@linutronix.de, jolsa@kernel.org, eranian@google.com Reply-To: peterz@infradead.org, fweisbec@gmail.com, mingo@kernel.org, torvalds@linux-foundation.org, namhyung@kernel.org, hpa@zytor.com, jolsa@kernel.org, acme@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, eranian@google.com In-Reply-To: <1422467678-22341-1-git-send-email-jolsa@kernel.org> References: <1422467678-22341-1-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf: Use POLLIN instead of POLL_IN for perf poll data in flag Git-Commit-ID: 7c60fc0e022858e19c66289ec65cc3effc8c0b1f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7c60fc0e022858e19c66289ec65cc3effc8c0b1f Gitweb: http://git.kernel.org/tip/7c60fc0e022858e19c66289ec65cc3effc8c0b1f Author: Jiri Olsa AuthorDate: Wed, 28 Jan 2015 18:54:38 +0100 Committer: Ingo Molnar CommitDate: Wed, 4 Feb 2015 08:07:13 +0100 perf: Use POLLIN instead of POLL_IN for perf poll data in flag Currently we flag available data (via poll syscall) on perf fd with POLL_IN macro, which is normally used for SIGIO interface. We've been lucky, because POLLIN (0x1) is subset of POLL_IN (0x20001) and sys_poll (do_pollfd function) cut the extra bit out (0x20000). Signed-off-by: Jiri Olsa Signed-off-by: Peter Zijlstra (Intel) Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Stephane Eranian Cc: Arnaldo Carvalho de Melo Cc: Linus Torvalds Link: http://lkml.kernel.org/r/1422467678-22341-1-git-send-email-jolsa@kernel.org Signed-off-by: Ingo Molnar --- kernel/events/ring_buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index 146a579..eadb95c 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -13,12 +13,13 @@ #include #include #include +#include #include "internal.h" static void perf_output_wakeup(struct perf_output_handle *handle) { - atomic_set(&handle->rb->poll, POLL_IN); + atomic_set(&handle->rb->poll, POLLIN); handle->event->pending_wakeup = 1; irq_work_queue(&handle->event->pending);