diff --git a/[refs] b/[refs] index f1d86c63e7bf..f9414ea8f24b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1a3c979059b2033d0b1cc4f9ee5c90bf92b5f94 +refs/heads/master: 081fad86178ec0f64f32f1bd04cf4aad22714fb9 diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index ef5d8a5b2453..663bbe015057 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -3570,12 +3570,8 @@ perf_counter_alloc(struct perf_counter_attr *attr, if (attr->inherit && (attr->sample_type & PERF_SAMPLE_GROUP)) goto done; - if (attr->type == PERF_TYPE_RAW) { - pmu = hw_perf_counter_init(counter); - goto done; - } - switch (attr->type) { + case PERF_TYPE_RAW: case PERF_TYPE_HARDWARE: case PERF_TYPE_HW_CACHE: pmu = hw_perf_counter_init(counter);