[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-3f237a79ddeea34dda67e9eedece3a22918df75e@git.kernel.org>
Date: Mon, 15 Jun 2009 18:12:50 GMT
From: tip-bot for Rusty Russell <rusty@...tcorp.com.au>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
rostedt@...dmis.org, rusty@...tcorp.com.au, tglx@...utronix.de
Subject: [tip:tracing/urgent] cpumask: use new operators in kernel/trace
Commit-ID: 3f237a79ddeea34dda67e9eedece3a22918df75e
Gitweb: http://git.kernel.org/tip/3f237a79ddeea34dda67e9eedece3a22918df75e
Author: Rusty Russell <rusty@...tcorp.com.au>
AuthorDate: Fri, 12 Jun 2009 21:15:30 +0930
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Mon, 15 Jun 2009 11:36:42 -0400
cpumask: use new operators in kernel/trace
Signed-off-by: Rusty Russell <rusty@...tcorp.com.au>
LKML-Reference: <200906122115.30787.rusty@...tcorp.com.au>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
kernel/trace/kmemtrace.c | 2 +-
kernel/trace/ring_buffer.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c
index 86cdf67..1edaa95 100644
--- a/kernel/trace/kmemtrace.c
+++ b/kernel/trace/kmemtrace.c
@@ -186,7 +186,7 @@ static int kmem_trace_init(struct trace_array *tr)
int cpu;
kmemtrace_array = tr;
- for_each_cpu_mask(cpu, cpu_possible_map)
+ for_each_cpu(cpu, cpu_possible_mask)
tracing_reset(tr, cpu);
kmemtrace_start_probes();
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 2e642b2..9c31c9f 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,
switch (action) {
case CPU_UP_PREPARE:
case CPU_UP_PREPARE_FROZEN:
- if (cpu_isset(cpu, *buffer->cpumask))
+ if (cpumask_test_cpu(cpu, buffer->cpumask))
return NOTIFY_OK;
buffer->buffers[cpu] =
@@ -3116,7 +3116,7 @@ static int rb_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
smp_wmb();
- cpu_set(cpu, *buffer->cpumask);
+ cpumask_set_cpu(cpu, buffer->cpumask);
break;
case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE_FROZEN:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists