Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761Ab3IJSM0 (ORCPT ); Tue, 10 Sep 2013 14:12:26 -0400 Received: from merlin.infradead.org ([205.233.59.134]:53812 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752302Ab3IJSMW (ORCPT ); Tue, 10 Sep 2013 14:12:22 -0400 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Andi Kleen , David Ahern , Frederic Weisbecker , Ingo Molnar , Jiri Olsa , Mike Galbraith , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo Subject: [GIT PULL 0/5] perf/urgent fixes Date: Tue, 10 Sep 2013 15:11:57 -0300 Message-Id: <1378836722-31326-1-git-send-email-acme@infradead.org> X-Mailer: git-send-email 1.8.1.4 X-SRS-Rewrite: SMTP reverse-path rewritten from by merlin.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3190 Lines: 85 From: Arnaldo Carvalho de Melo Hi Ingo, Please consider pulling, - Arnaldo The following changes since commit 72f4a11d2fb16792f5e5107922652366194cfd66: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2013-09-06 14:08:08 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux tags/perf-urgent-for-mingo for you to fetch changes up to e08eedca944bd6419c9441012e98e7af14ebd175: perf: Fix up MMAP2 buffer space reservation (2013-09-10 10:42:20 -0300) ---------------------------------------------------------------- perf/urgent fixes: . Handle perf.data files with no tracepoints in 'perf trace', fixing a segfault. . Fix up MMAP2 buffer space reservation, a problem that was caught via 'perf test' consistency tests. . Add attr->mmap2 support in the tools, a patch that should've been merged together with the kernel counterpart: 13d7a24 "perf: Add attr->mmap2 attribute to an event". Merging it allowed us to catch the MMAP buffer space reservation problem via 'perf test'. From Stephane Eranian. . Make sure we can find PERF_SAMPLE_ID in the variable part of PERF_RECORD_ ring buffer records in 'perf kvm', where direct manipulation of sample_type was being done. Fixed by making use of the perf_evlist__set_sample_bit() helper and by setting the evlist->id_pos in perf_evlist__open(), from Adrian Hunter. Signed-off-by: Arnaldo Carvalho de Melo ---------------------------------------------------------------- Adrian Hunter (2): perf evlist: Fix id pos in perf_evlist__open() perf kvm: Fix sample_type manipulation Arnaldo Carvalho de Melo (2): perf trace: Handle perf.data files with no tracepoints perf: Fix up MMAP2 buffer space reservation Stephane Eranian (1): perf tools: Add attr->mmap2 support kernel/events/core.c | 1 + tools/perf/builtin-annotate.c | 1 + tools/perf/builtin-inject.c | 15 ++++++++++ tools/perf/builtin-kvm.c | 18 ++++++------ tools/perf/builtin-mem.c | 1 + tools/perf/builtin-report.c | 1 + tools/perf/builtin-script.c | 1 + tools/perf/tests/perf-record.c | 15 +++++++--- tools/perf/util/build-id.c | 1 + tools/perf/util/event.c | 56 ++++++++++++++++++++++++++++-------- tools/perf/util/event.h | 19 ++++++++++++ tools/perf/util/evlist.c | 12 ++++++++ tools/perf/util/evsel.c | 5 ++-- tools/perf/util/header.c | 3 ++ tools/perf/util/machine.c | 53 +++++++++++++++++++++++++++++++++- tools/perf/util/machine.h | 1 + tools/perf/util/map.c | 8 +++++- tools/perf/util/map.h | 8 ++++-- tools/perf/util/session.c | 65 ++++++++++++++++++++---------------------- tools/perf/util/tool.h | 1 + 20 files changed, 220 insertions(+), 65 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/