The patch titled statistics infrastructure - update 3 has been added to the -mm tree. Its filename is statistics-infrastructure-update-3.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: statistics infrastructure - update 3 From: Martin Peschke <mp3@xxxxxxxxxx> this patch makes printk_clock() a generic kernel-wide nsec-resolution timestamp_clock(). It's used both by printk() as well as the statistics infrastructure to provide unified time stamps to users. Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- lib/statistic.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff -puN lib/statistic.c~statistics-infrastructure-update-3 lib/statistic.c --- devel/lib/statistic.c~statistics-infrastructure-update-3 2006-05-30 15:22:01.000000000 -0700 +++ devel-akpm/lib/statistic.c 2006-05-30 15:22:01.000000000 -0700 @@ -148,7 +148,8 @@ static int statistic_alloc(struct statis struct statistic_info *info) { int cpu; - stat->age = sched_clock(); + + stat->age = timestamp_clock(); if (unlikely(info->flags & STATISTIC_FLAGS_NOINCR)) { stat->pdata = statistic_alloc_ptr(stat, GFP_KERNEL, -1); if (unlikely(!stat->pdata)) @@ -173,7 +174,7 @@ static int statistic_alloc(struct statis static int statistic_start(struct statistic *stat) { - stat->started = sched_clock(); + stat->started = timestamp_clock(); stat->state = STATISTIC_STATE_ON; return 0; } @@ -184,7 +185,7 @@ static void _statistic_barrier(void *unu static int statistic_stop(struct statistic *stat) { - stat->stopped = sched_clock(); + stat->stopped = timestamp_clock(); stat->state = STATISTIC_STATE_OFF; /* ensures that all CPUs have ceased updating statistics */ smp_mb(); @@ -239,7 +240,7 @@ static int statistic_reset(struct statis else for_each_possible_cpu(cpu) statistic_reset_ptr(stat, stat->pdata->ptrs[cpu]); - stat->age = sched_clock(); + stat->age = timestamp_clock(); statistic_transition(stat, info, prev_state); return 0; } _ Patches currently in -mm which might be from mp3@xxxxxxxxxx are statistics-infrastructure-prerequisite-list.patch statistics-infrastructure-prerequisite-parser.patch statistics-infrastructure-prerequisite-timestamp.patch statistics-infrastructure-make-printk_clock-a-generic-kernel-wide-nsec-resolution.patch statistics-infrastructure-documentation.patch statistics-infrastructure.patch statistics-infrastructure-update-1.patch statistics-infrastructure-exploitation-zfcp.patch statistics-infrastructure-update-3.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html