This patch kills a few lines of code in blktrace by making use of
on_each_cpu().
Patch against 2.6.18-rc4-mm3.
(Tested with 2.6.17.11, though, as -rc4-mm3 refuses to come up on my
s390 guest.)
Signed-off-by: Martin Peschke <[email protected]>
---
blktrace.c | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff -urp a/block/blktrace.c b/block/blktrace.c
--- a/block/blktrace.c 2006-08-29 18:10:51.000000000 +0200
+++ b/block/blktrace.c 2006-08-29 19:00:37.000000000 +0200
@@ -476,6 +476,9 @@ static void blk_check_time(unsigned long
*t -= (a + b) / 2;
}
+/*
+ * calibrate our inter-CPU timings
+ */
static void blk_trace_check_cpu_time(void *data)
{
unsigned long long *t;
@@ -493,20 +496,6 @@ static void blk_trace_check_cpu_time(voi
put_cpu();
}
-/*
- * Call blk_trace_check_cpu_time() on each CPU to calibrate our
inter-CPU
- * timings
- */
-static void blk_trace_calibrate_offsets(void)
-{
- unsigned long flags;
-
- smp_call_function(blk_trace_check_cpu_time, NULL, 1, 1);
- local_irq_save(flags);
- blk_trace_check_cpu_time(NULL);
- local_irq_restore(flags);
-}
-
static void blk_trace_set_ht_offsets(void)
{
#if defined(CONFIG_SCHED_SMT)
@@ -535,7 +524,7 @@ static void blk_trace_set_ht_offsets(voi
static __init int blk_trace_init(void)
{
mutex_init(&blk_tree_mutex);
- blk_trace_calibrate_offsets();
+ on_each_cpu(blk_trace_check_cpu_time, NULL, 1, 1);
blk_trace_set_ht_offsets();
return 0;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
