From 1918e73d1b49214629d04b1f7349b434e76253d2 Mon Sep 17 00:00:00 2001 From: "Ahmed S. Darwish" Date: Sat, 25 Dec 2010 11:57:09 +0200 Subject: [PATCH] --- yaml --- r: 223677 b: refs/heads/master c: 1873bb8115e678ad9fd0aac9dbbc68383bc36e06 h: refs/heads/master i: 223675: 6bccc57298f923b3dbef67cf5e4608d3e6431d1b v: v3 --- [refs] | 2 +- trunk/drivers/char/ramoops.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 87877017d96f..a6a13c59ca5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffc96d628b651b69b39909fc3e9e8f465df1eed3 +refs/heads/master: 1873bb8115e678ad9fd0aac9dbbc68383bc36e06 diff --git a/trunk/drivers/char/ramoops.c b/trunk/drivers/char/ramoops.c index 73dcb0ee41fd..d3d63be2cd37 100644 --- a/trunk/drivers/char/ramoops.c +++ b/trunk/drivers/char/ramoops.c @@ -29,7 +29,6 @@ #include #define RAMOOPS_KERNMSG_HDR "====" -#define RAMOOPS_HEADER_SIZE (5 + sizeof(struct timeval)) #define RECORD_SIZE 4096 @@ -65,8 +64,8 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper, struct ramoops_context, dump); unsigned long s1_start, s2_start; unsigned long l1_cpy, l2_cpy; - int res; - char *buf; + int res, hdr_size; + char *buf, *buf_orig; struct timeval timestamp; /* Only dump oopses if dump_oops is set */ @@ -74,6 +73,8 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper, return; buf = (char *)(cxt->virt_addr + (cxt->count * RECORD_SIZE)); + buf_orig = buf; + memset(buf, '\0', RECORD_SIZE); res = sprintf(buf, "%s", RAMOOPS_KERNMSG_HDR); buf += res; @@ -81,8 +82,9 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper, res = sprintf(buf, "%lu.%lu\n", (long)timestamp.tv_sec, (long)timestamp.tv_usec); buf += res; - l2_cpy = min(l2, (unsigned long)(RECORD_SIZE - RAMOOPS_HEADER_SIZE)); - l1_cpy = min(l1, (unsigned long)(RECORD_SIZE - RAMOOPS_HEADER_SIZE) - l2_cpy); + hdr_size = buf - buf_orig; + l2_cpy = min(l2, (unsigned long)(RECORD_SIZE - hdr_size)); + l1_cpy = min(l1, (unsigned long)(RECORD_SIZE - hdr_size) - l2_cpy); s2_start = l2 - l2_cpy; s1_start = l1 - l1_cpy;