From e5151dcd2a97e57f35acac449b96356b09fbb330 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 25 May 2009 14:40:01 +0200 Subject: [PATCH] --- yaml --- r: 147498 b: refs/heads/master c: d3f4b3855ba87caff8f35e738c7e7e3bad0a6ab1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/perf_counter/builtin-stat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a97ab8e50deb..73a720a7eddf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4cbb4e3ac8b09fdb11e39e5a5611bfab0a7cd1a +refs/heads/master: d3f4b3855ba87caff8f35e738c7e7e3bad0a6ab1 diff --git a/trunk/Documentation/perf_counter/builtin-stat.c b/trunk/Documentation/perf_counter/builtin-stat.c index 8ae01d51f291..88c70be99031 100644 --- a/trunk/Documentation/perf_counter/builtin-stat.c +++ b/trunk/Documentation/perf_counter/builtin-stat.c @@ -266,9 +266,9 @@ static __u64 match_event_symbols(char *str) switch (sscanf(str, "%d:%llu:%2s", &type, &id, mask_str)) { case 3: - if (strchr(mask_str, 'u')) - event_mask[nr_counters] |= EVENT_MASK_USER; if (strchr(mask_str, 'k')) + event_mask[nr_counters] |= EVENT_MASK_USER; + if (strchr(mask_str, 'u')) event_mask[nr_counters] |= EVENT_MASK_KERNEL; case 2: return EID(type, id);