From 7508280844ca92ec07a4f202b5296c67e30f6d5d Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 9 Apr 2009 09:48:22 +0200 Subject: [PATCH] --- yaml --- r: 147356 b: refs/heads/master c: 888fcee066a2f4abd0d0bc9418c0535f9b01e6e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7fc98e0f9b2b..8ed9c17063c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca8f2d7f019a8547f39ddb9ed0144932f12807f2 +refs/heads/master: 888fcee066a2f4abd0d0bc9418c0535f9b01e6e5 diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 321c57e3556f..b07195bbd228 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -1989,7 +1989,7 @@ static void perf_counter_comm_event(struct perf_comm_event *comm_event) unsigned int size; char *comm = comm_event->task->comm; - size = ALIGN(strlen(comm), sizeof(u64)); + size = ALIGN(strlen(comm)+1, sizeof(u64)); comm_event->comm = comm; comm_event->comm_size = size; @@ -2109,7 +2109,7 @@ static void perf_counter_mmap_event(struct perf_mmap_event *mmap_event) } got_name: - size = ALIGN(strlen(name), sizeof(u64)); + size = ALIGN(strlen(name)+1, sizeof(u64)); mmap_event->file_name = name; mmap_event->file_size = size;