Merge remote branch 'tip/perf/core' into oprofile/core
[linux-3.10.git] / drivers / oprofile / oprofile_perf.c
index b17235a..79c0005 100644 (file)
@@ -77,7 +77,7 @@ static int op_create_counter(int cpu, int event)
                return 0;
 
        pevent = perf_event_create_kernel_counter(&counter_config[event].attr,
-                                                 cpu, -1,
+                                                 cpu, NULL,
                                                  op_overflow_handler);
 
        if (IS_ERR(pevent))