Commit ff6f0541 authored by Paul Mackerras's avatar Paul Mackerras

perf_counter: Fix return value from dummy hw_perf_counter_init

Impact: fix oops-causing bug

Currently, if you try to use perf_counters on an architecture that has
no hardware support, and you select an event that doesn't map to any of
the defined software counters, you get an oops rather than an error.
This is because the dummy hw_perf_counter_init returns ERR_PTR(-EINVAL)
but the caller (perf_counter_alloc) only tests for NULL.

This makes the dummy hw_perf_counter_init return NULL instead.
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e1df9576
...@@ -41,7 +41,7 @@ static DEFINE_MUTEX(perf_resource_mutex); ...@@ -41,7 +41,7 @@ static DEFINE_MUTEX(perf_resource_mutex);
extern __weak const struct hw_perf_counter_ops * extern __weak const struct hw_perf_counter_ops *
hw_perf_counter_init(struct perf_counter *counter) hw_perf_counter_init(struct perf_counter *counter)
{ {
return ERR_PTR(-EINVAL); return NULL;
} }
u64 __weak hw_perf_save_disable(void) { return 0; } u64 __weak hw_perf_save_disable(void) { return 0; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment