]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 2 May 2012 17:33:34 +0000 (19:33 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 2 May 2012 17:33:34 +0000 (19:33 +0200)
commit70edc1a7112c3ef4965a7c9b8c5102986057b33f
tree6540196a1d3e0b626ca7c3be6708dfd11779814f
parent4b916c48d8e43dee0969a7c23bafcf3de358ffa2
parentbb0e8d9fedfec26a832b28c96dba371654d35d81
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Fixes for perf/urgent:

- Add fallback in 'perf stat' for kernels that don't support
  perf_event_attr.exclude_guest, from Stephane Eranian.

- Fix build id cache add routine to take the size of the buffer and not of a
  pointer, from Namhyung Kim.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>