From: Andrew Morton - one decl per line is more patching-friendly and a bit more idiomatic. - make `bad_count' an int: a uchar might overflow - Put a blank line between decls and code - rename `total' to `error', remove `errors'. - there's no need to sum up the errors. - don't need to check for non-zero `errors': we know it is != POISON_FREE. - make it look non-crapful in an 80-col window. - add missing spaces in arithmetic Cc: Dave Jones Signed-off-by: Andrew Morton --- mm/slab.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff -puN mm/slab.c~single-bit-flip-detector-tidy mm/slab.c --- a/mm/slab.c~single-bit-flip-detector-tidy +++ a/mm/slab.c @@ -1683,11 +1683,13 @@ static void poison_obj(struct kmem_cache static void dump_line(char *data, int offset, int limit) { int i; - unsigned char total = 0, bad_count = 0, errors; + unsigned char error = 0; + int bad_count = 0; + printk(KERN_ERR "%03x:", offset); for (i = 0; i < limit; i++) { if (data[offset + i] != POISON_FREE) { - total += data[offset + i]; + error = data[offset + i]; bad_count++; } printk(" %02x", (unsigned char)data[offset + i]); @@ -1695,11 +1697,13 @@ static void dump_line(char *data, int of printk("\n"); if (bad_count == 1) { - errors = total ^ POISON_FREE; - if (errors && !(errors & (errors-1))) { - printk(KERN_ERR "Single bit error detected. Probably bad RAM.\n"); + error ^= POISON_FREE; + if (!(error & (error - 1))) { + printk(KERN_ERR "Single bit error detected. Probably " + "bad RAM.\n"); #ifdef CONFIG_X86 - printk(KERN_ERR "Run memtest86+ or a similar memory test tool.\n"); + printk(KERN_ERR "Run memtest86+ or a similar memory " + "test tool.\n"); #else printk(KERN_ERR "Run a memory test tool.\n"); #endif _