Merge branch 'perf/urgent' into perf/core

[net-next-2.6.git] / arch / arm / oprofile / common.c

diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 72e09eb642dd7c7a00d47fce210bb1290e926fd9..d1fb5b2f5218c10cce1ca88450ef6dc09ad66de2 100644 (file)
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -96,7 +96,7 @@ static int op_create_counter(int cpu, int event)
                return ret;
 
        pevent = perf_event_create_kernel_counter(&counter_config[event].attr,
-                                                 cpu, -1,
+                                                 cpu, NULL,
                                                  op_overflow_handler);
 
        if (IS_ERR(pevent)) {