aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-06-12 07:45:30 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-06-15 11:36:42 -0400
commit3f237a79ddeea34dda67e9eedece3a22918df75e (patch)
tree6a7e57e038edda3fd71d05424ec1c9d744ad0cc4
parent45e3e1935e2857c54783291107d33323b3ef33c8 (diff)
cpumask: use new operators in kernel/trace
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> LKML-Reference: <200906122115.30787.rusty@rustcorp.com.au> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--kernel/trace/kmemtrace.c2
-rw-r--r--kernel/trace/ring_buffer.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c
index 86cdf671d7e2..1edaa9516e81 100644
--- a/kernel/trace/kmemtrace.c
+++ b/kernel/trace/kmemtrace.c
@@ -186,7 +186,7 @@ static int kmem_trace_init(struct trace_array *tr)
186 int cpu; 186 int cpu;
187 kmemtrace_array = tr; 187 kmemtrace_array = tr;
188 188
189 for_each_cpu_mask(cpu, cpu_possible_map) 189 for_each_cpu(cpu, cpu_possible_mask)
190 tracing_reset(tr, cpu); 190 tracing_reset(tr, cpu);
191 191
192 kmemtrace_start_probes(); 192 kmemtrace_start_probes();
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 2e642b2b7253..9c31c9f6b93f 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -3105,7 +3105,7 @@ static int rb_cpu_notify(struct notifier_block *self,
3105 switch (action) { 3105 switch (action) {
3106 case CPU_UP_PREPARE: 3106 case CPU_UP_PREPARE:
3107 case CPU_UP_PREPARE_FROZEN: 3107 case CPU_UP_PREPARE_FROZEN:
3108 if (cpu_isset(cpu, *buffer->cpumask)) 3108 if (cpumask_test_cpu(cpu, buffer->cpumask))
3109 return NOTIFY_OK; 3109 return NOTIFY_OK;
3110 3110
3111 buffer->buffers[cpu] = 3111 buffer->buffers[cpu] =
@@ -3116,7 +3116,7 @@ static int rb_cpu_notify(struct notifier_block *self,
3116 return NOTIFY_OK; 3116 return NOTIFY_OK;
3117 } 3117 }
3118 smp_wmb(); 3118 smp_wmb();
3119 cpu_set(cpu, *buffer->cpumask); 3119 cpumask_set_cpu(cpu, buffer->cpumask);
3120 break; 3120 break;
3121 case CPU_DOWN_PREPARE: 3121 case CPU_DOWN_PREPARE:
3122 case CPU_DOWN_PREPARE_FROZEN: 3122 case CPU_DOWN_PREPARE_FROZEN: