From 201059789942c5b25c5c5443a7b39793a68b3477 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Wed, 29 Sep 2010 14:43:29 +0200 Subject: [PATCH] --- yaml --- r: 211911 b: refs/heads/master c: f6be4b428197766521aca664a935c63888d096d9 h: refs/heads/master i: 211909: fd29ab0716094ba3bd6141cbbd1de4bc94e1cf65 211907: de227ab414a4af573c40f4a12d34d7a6fef6c465 211903: b561b79c3b9f5029a5f90b3b2cc2ebdf6e18e1f8 v: v3 --- [refs] | 2 +- trunk/arch/arm/oprofile/common.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 414a800e8cd7..967f06037d39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d1814f48edec31f12737609cd1c871864c8298b +refs/heads/master: f6be4b428197766521aca664a935c63888d096d9 diff --git a/trunk/arch/arm/oprofile/common.c b/trunk/arch/arm/oprofile/common.c index 7ae9eebe7efc..cec9305c1cce 100644 --- a/trunk/arch/arm/oprofile/common.c +++ b/trunk/arch/arm/oprofile/common.c @@ -89,28 +89,28 @@ static void op_perf_setup(void) static int op_create_counter(int cpu, int event) { - int ret = 0; struct perf_event *pevent; - if (!counter_config[event].enabled || (perf_events[cpu][event] != NULL)) - return ret; + if (!counter_config[event].enabled || perf_events[cpu][event]) + return 0; pevent = perf_event_create_kernel_counter(&counter_config[event].attr, cpu, -1, op_overflow_handler); - if (IS_ERR(pevent)) { - ret = PTR_ERR(pevent); - } else if (pevent->state != PERF_EVENT_STATE_ACTIVE) { + if (IS_ERR(pevent)) + return PTR_ERR(pevent); + + if (pevent->state != PERF_EVENT_STATE_ACTIVE) { perf_event_release_kernel(pevent); pr_warning("oprofile: failed to enable event %d " "on CPU %d\n", event, cpu); - ret = -EBUSY; - } else { - perf_events[cpu][event] = pevent; + return -EBUSY; } - return ret; + perf_events[cpu][event] = pevent; + + return 0; } static void op_destroy_counter(int cpu, int event)