From: San Mehat <san@google.com>
Date: Thu, 17 Sep 2009 21:27:41 +0000 (-0700)
Subject: ramconsole/apanic: Ensure ramconsole does not get cluttered by apanic threads
X-Git-Tag: firefly_0821_release~7613^2~758
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3af8d4fce4970d4206dbe06f22a9c1b5e322858;p=firefly-linux-kernel-4.4.55.git

ramconsole/apanic: Ensure ramconsole does not get cluttered by apanic threads

Signed-off-by: San Mehat <san@google.com>
---

diff --git a/drivers/misc/apanic.c b/drivers/misc/apanic.c
index fde087122473..2f858be7ef59 100644
--- a/drivers/misc/apanic.c
+++ b/drivers/misc/apanic.c
@@ -38,6 +38,8 @@
 #include <linux/workqueue.h>
 #include <linux/preempt.h>
 
+extern void ram_console_enable_console(int);
+
 struct panic_header {
 	u32 magic;
 #define PANIC_MAGIC 0xdeadf00d
@@ -468,6 +470,8 @@ static int apanic(struct notifier_block *this, unsigned long event,
 	if (!threads_offset)
 		threads_offset = ctx->mtd->writesize;
 
+	ram_console_enable_console(0);
+
 	log_buf_clear();
 	show_state_filter(0);
 	threads_len = apanic_write_console(ctx->mtd, threads_offset);
diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c
index 8f18a59744cd..d735be45f162 100644
--- a/drivers/staging/android/ram_console.c
+++ b/drivers/staging/android/ram_console.c
@@ -146,6 +146,14 @@ static struct console ram_console = {
 	.index	= -1,
 };
 
+void ram_console_enable_console(int enabled)
+{
+	if (enabled)
+		ram_console.flags |= CON_ENABLED;
+	else
+		ram_console.flags &= ~CON_ENABLED;
+}
+
 static void __init
 ram_console_save_old(struct ram_console_buffer *buffer, char *dest)
 {