diff options
Diffstat (limited to 'kernel/trace/trace_irqsoff.c')
| -rw-r--r-- | kernel/trace/trace_irqsoff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index b3cf6bf308ef..9b52f9cf7a0d 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c | |||
| @@ -121,7 +121,7 @@ static int func_prolog_dec(struct trace_array *tr, | |||
| 121 | if (!irqs_disabled_flags(*flags)) | 121 | if (!irqs_disabled_flags(*flags)) |
| 122 | return 0; | 122 | return 0; |
| 123 | 123 | ||
| 124 | *data = tr->data[cpu]; | 124 | *data = per_cpu_ptr(tr->data, cpu); |
| 125 | disabled = atomic_inc_return(&(*data)->disabled); | 125 | disabled = atomic_inc_return(&(*data)->disabled); |
| 126 | 126 | ||
| 127 | if (likely(disabled == 1)) | 127 | if (likely(disabled == 1)) |
| @@ -380,7 +380,7 @@ start_critical_timing(unsigned long ip, unsigned long parent_ip) | |||
| 380 | if (per_cpu(tracing_cpu, cpu)) | 380 | if (per_cpu(tracing_cpu, cpu)) |
| 381 | return; | 381 | return; |
| 382 | 382 | ||
| 383 | data = tr->data[cpu]; | 383 | data = per_cpu_ptr(tr->data, cpu); |
| 384 | 384 | ||
| 385 | if (unlikely(!data) || atomic_read(&data->disabled)) | 385 | if (unlikely(!data) || atomic_read(&data->disabled)) |
| 386 | return; | 386 | return; |
| @@ -418,7 +418,7 @@ stop_critical_timing(unsigned long ip, unsigned long parent_ip) | |||
| 418 | if (!tracer_enabled) | 418 | if (!tracer_enabled) |
| 419 | return; | 419 | return; |
| 420 | 420 | ||
| 421 | data = tr->data[cpu]; | 421 | data = per_cpu_ptr(tr->data, cpu); |
| 422 | 422 | ||
| 423 | if (unlikely(!data) || | 423 | if (unlikely(!data) || |
| 424 | !data->critical_start || atomic_read(&data->disabled)) | 424 | !data->critical_start || atomic_read(&data->disabled)) |