diff options
| author | Tejun Heo <tj@kernel.org> | 2009-09-15 02:57:19 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-15 02:57:19 +0200 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /kernel/perf_counter.c | |
| parent | percpu: don't assume existence of cpu0 (diff) | |
| parent | powerpc64: convert to dynamic percpu allocator (diff) | |
| download | linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.xz linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.zip | |
Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
Conflicts:
mm/percpu.c
Diffstat (limited to 'kernel/perf_counter.c')
| -rw-r--r-- | kernel/perf_counter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c index 534e20d14d63..b0bdb36ccfc8 100644 --- a/kernel/perf_counter.c +++ b/kernel/perf_counter.c @@ -100,16 +100,16 @@ hw_perf_group_sched_in(struct perf_counter *group_leader, void __weak perf_counter_print_debug(void) { } -static DEFINE_PER_CPU(int, disable_count); +static DEFINE_PER_CPU(int, perf_disable_count); void __perf_disable(void) { - __get_cpu_var(disable_count)++; + __get_cpu_var(perf_disable_count)++; } bool __perf_enable(void) { - return !--__get_cpu_var(disable_count); + return !--__get_cpu_var(perf_disable_count); } void perf_disable(void) |