perf, x86: Report error code that returned from x86_pmu.hw_config()

If x86_pmu.hw_config() fails a fixed error code (-EOPNOTSUPP) is
returned even if a different error was reported. This patch fixes
this.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Acked-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: Lin Ming <ming.m.lin@intel.com>
Cc: acme@redhat.com
Cc: eranian@google.com
Cc: gorcunov@openvz.org
Cc: peterz@infradead.org
Cc: fweisbec@gmail.com
LKML-Reference: <20100316160733.GR1585@erda.amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 0d3466cf7f578696507f9dfe51f89c165d3c499b..5dacf63f913e74d9e3d39ddb3bdebefc8c9165d9 100644 (file)
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -472,8 +472,9 @@ static int __hw_perf_event_init(struct perf_event *event)
        hwc->last_tag = ~0ULL;
 
        /* Processor specifics */
-       if (x86_pmu.hw_config(attr, hwc))
-               return -EOPNOTSUPP;
+       err = x86_pmu.hw_config(attr, hwc);
+       if (err)
+               return err;
 
        if (!hwc->sample_period) {
                hwc->sample_period = x86_pmu.max_period;