The patch titled
restore correct print_len calculation in printk
has been added to the -mm tree. Its filename is
statistics-infrastructure-prerequisite-timestamp-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: restore correct print_len calculation in printk
From: Martin Peschke <mp3@xxxxxxxxxx>
This fixes the following miscalculation that has been introduced by my
statistics-infrastructure-prerequisite-timestamp.patch:
print_len loses 3 in the 'got log level'-case due to a surplus
substraction. It also loses 3 in the other case due to adding a log level
substring that is not entered in the books.
Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/printk.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/printk.c~statistics-infrastructure-prerequisite-timestamp-fix kernel/printk.c
--- 25/kernel/printk.c~statistics-infrastructure-prerequisite-timestamp-fix Fri Jun 2 14:30:59 2006
+++ 25-akpm/kernel/printk.c Fri Jun 2 14:30:59 2006
@@ -534,9 +534,9 @@ asmlinkage int vprintk(const char *fmt,
p[1] <= '7' && p[2] == '>') {
loglev_char = p[1];
p += 3;
- printed_len -= 3;
} else {
loglev_char = default_message_loglevel + '0';
+ printed_len += 3;
}
emit_log_char('<');
emit_log_char(loglev_char);
_
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-prerequisite-timestamp-fix.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-update-2.patch
statistics-infrastructure-update-3.patch
statistics-infrastructure-exploitation-zfcp.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
