diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2011-01-12 17:01:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 08:03:23 -0800 |
| commit | 264b795fbd055f57b445eb3d58cfc51d6b10b22e (patch) | |
| tree | 7511840b71b0c5736b9d679f6adac632ecde64ce /drivers/char/ramoops.c | |
| parent | 6f772fe65c7aa1a4679739d885775f07492a6eea (diff) | |
| download | op-kernel-dev-264b795fbd055f57b445eb3d58cfc51d6b10b22e.zip op-kernel-dev-264b795fbd055f57b445eb3d58cfc51d6b10b22e.tar.gz | |
ramoops: fix types, remove typecasts
Cc: Ahmed S. Darwish <darwish.07@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/ramoops.c')
| -rw-r--r-- | drivers/char/ramoops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c index eeec575..1a9f5f6 100644 --- a/drivers/char/ramoops.c +++ b/drivers/char/ramoops.c @@ -30,7 +30,7 @@ #define RAMOOPS_KERNMSG_HDR "====" -#define RECORD_SIZE 4096 +#define RECORD_SIZE 4096UL static ulong mem_address; module_param(mem_address, ulong, 0400); @@ -77,7 +77,7 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper, if (reason == KMSG_DUMP_OOPS && !dump_oops) return; - buf = (char *)(cxt->virt_addr + (cxt->count * RECORD_SIZE)); + buf = cxt->virt_addr + (cxt->count * RECORD_SIZE); buf_orig = buf; memset(buf, '\0', RECORD_SIZE); @@ -88,8 +88,8 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper, buf += res; 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); + l2_cpy = min(l2, RECORD_SIZE - hdr_size); + l1_cpy = min(l1, RECORD_SIZE - hdr_size - l2_cpy); s2_start = l2 - l2_cpy; s1_start = l1 - l1_cpy; |
