diff --git a/[refs] b/[refs] index 12fce7d8e78a..63484fddc6b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b9ff0db19b5e2c77000b7201525f9c3d6e8328d +refs/heads/master: 088e2852c858159d47f71ee8da38e0fb1b21f806 diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 59c52f9ee431..539fa8283a06 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -25,7 +25,7 @@ */ DEFINE_PER_CPU(struct perf_cpu_context, perf_cpu_context); -int perf_max_counters __read_mostly; +int perf_max_counters __read_mostly = 1; static int perf_reserved_percpu __read_mostly; static int perf_overcommit __read_mostly = 1;