Commit-ID: 7c60fc0e022858e19c66289ec65cc3effc8c0b1f Gitweb: http://git.kernel.org/tip/7c60fc0e022858e19c66289ec65cc3effc8c0b1f Author: Jiri Olsa <jo...@kernel.org> AuthorDate: Wed, 28 Jan 2015 18:54:38 +0100 Committer: Ingo Molnar <mi...@kernel.org> 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 <jo...@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Frederic Weisbecker <fweis...@gmail.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Stephane Eranian <eran...@google.com> Cc: Arnaldo Carvalho de Melo <a...@kernel.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Link: http://lkml.kernel.org/r/1422467678-22341-1-git-send-email-jo...@kernel.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- 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 <linux/vmalloc.h> #include <linux/slab.h> #include <linux/circ_buf.h> +#include <linux/poll.h> #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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
