mirror of https://gitee.com/openkylin/linux.git
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: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
e1df957670
commit
ff6f05416e
|
@ -41,7 +41,7 @@ static DEFINE_MUTEX(perf_resource_mutex);
|
|||
extern __weak const struct hw_perf_counter_ops *
|
||||
hw_perf_counter_init(struct perf_counter *counter)
|
||||
{
|
||||
return ERR_PTR(-EINVAL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
u64 __weak hw_perf_save_disable(void) { return 0; }
|
||||
|
|
Loading…
Reference in New Issue