From 95d5157128dfd1090340bcc3e666348d87da364d Mon Sep 17 00:00:00 2001
From: Sergiu Iordache <sergiu@chromium.org>
Date: Tue, 26 Jul 2011 16:08:58 -0700
Subject: [PATCH] --- yaml --- r: 260436 b: refs/heads/master c:
 6b4d2a2733b9a17112f746d498c9f9a0427dcdd8 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/ramoops.c  | 5 ++++-
 trunk/include/linux/ramoops.h | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 10f0e32ec4ec..cb4b81af4446 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0169256e4bbf29e507cdd1df5812c093d610f1d5
+refs/heads/master: 6b4d2a2733b9a17112f746d498c9f9a0427dcdd8
diff --git a/trunk/drivers/char/ramoops.c b/trunk/drivers/char/ramoops.c
index c9e1028766a4..5349d94e17da 100644
--- a/trunk/drivers/char/ramoops.c
+++ b/trunk/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/trunk/include/linux/ramoops.h b/trunk/include/linux/ramoops.h
index 0ae68a2c1212..7105c4b3a24e 100644
--- a/trunk/include/linux/ramoops.h
+++ b/trunk/include/linux/ramoops.h
@@ -10,6 +10,7 @@
 struct ramoops_platform_data {
 	unsigned long	mem_size;
 	unsigned long	mem_address;
+	int		dump_oops;
 };
 
 #endif