Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf kmem: Fix statistics typo
  kprobes: Fix distinct type warning
  perf: Rename perf_event_hw_event in design document
  perf tools: Add missing header files to LIB_H Makefile variable
  perf record: We should fork only if a program was specified to run
  perf diff: Fix usage array, it must end with a NULL entry

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index fc21ad79dd83..7ceb7416c316 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -137,7 +137,7 @@ static void insert_alloc_stat(unsigned long call_site, unsigned long ptr,
         if (data && data->ptr == ptr) {
                 data->hit++;
                 data->bytes_req += bytes_req;
-                data->bytes_alloc += bytes_req;
+                data->bytes_alloc += bytes_alloc;
         } else {
                 data = malloc(sizeof(*data));
                 if (!data)
@@ -177,7 +177,7 @@ static void insert_caller_stat(unsigned long call_site,
         if (data && data->call_site == call_site) {
                 data->hit++;
                 data->bytes_req += bytes_req;
-                data->bytes_alloc += bytes_req;
+                data->bytes_alloc += bytes_alloc;
         } else {
                 data = malloc(sizeof(*data));
                 if (!data)