diff options
| author | Sergiu Iordache <sergiu@chromium.org> | 2011-07-27 03:08:58 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 03:49:45 +0400 |
| commit | 6b4d2a2733b9a17112f746d498c9f9a0427dcdd8 (patch) | |
| tree | c0c637da5ede8828728bad87fba41e7ca7f11ca1 | |
| parent | 0169256e4bbf29e507cdd1df5812c093d610f1d5 (diff) | |
| download | linux-6b4d2a2733b9a17112f746d498c9f9a0427dcdd8.tar.xz | |
ramoops: move dump_oops into platform data
The platform driver currently allows setting the mem_size and
mem_address.
ince dump_oops is also a module parameter it would be more consistent if
it could be set through platform data as well.
Signed-off-by: Sergiu Iordache <sergiu@chromium.org>
Acked-by: Marco Stornelli <marco.stornelli@gmail.com>
Cc: "Ahmed S. Darwish" <darwish.07@gmail.com>
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/char/ramoops.c | 5 | ||||
| -rw-r--r-- | include/linux/ramoops.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c index c9e1028766a4..5349d94e17da 100644 --- a/drivers/char/ramoops.c +++ b/drivers/char/ramoops.c @@ -55,6 +55,7 @@ static struct ramoops_context { void *virt_addr; phys_addr_t phys_addr; unsigned long size; + int dump_oops; int count; int max_count; } oops_cxt; @@ -80,7 +81,7 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper, return; /* Only dump oopses if dump_oops is set */ - if (reason == KMSG_DUMP_OOPS && !dump_oops) + if (reason == KMSG_DUMP_OOPS && !cxt->dump_oops) return; buf = cxt->virt_addr + (cxt->count * RECORD_SIZE); @@ -128,6 +129,7 @@ static int __init ramoops_probe(struct platform_device *pdev) cxt->count = 0; cxt->size = pdata->mem_size; cxt->phys_addr = pdata->mem_address; + cxt->dump_oops = pdata->dump_oops; if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) { pr_err("request mem region failed\n"); @@ -194,6 +196,7 @@ static int __init ramoops_init(void) return -ENOMEM; dummy_data->mem_size = mem_size; dummy_data->mem_address = mem_address; + dummy_data->dump_oops = dump_oops; dummy = platform_create_bundle(&ramoops_driver, ramoops_probe, NULL, 0, dummy_data, sizeof(struct ramoops_platform_data)); diff --git a/include/linux/ramoops.h b/include/linux/ramoops.h index 0ae68a2c1212..7105c4b3a24e 100644 --- a/include/linux/ramoops.h +++ b/include/linux/ramoops.h @@ -10,6 +10,7 @@ struct ramoops_platform_data { unsigned long mem_size; unsigned long mem_address; + int dump_oops; }; #endif |