From e3af8d4fce4970d4206dbe06f22a9c1b5e322858 Mon Sep 17 00:00:00 2001 From: San Mehat Date: Thu, 17 Sep 2009 14:27:41 -0700 Subject: [PATCH 147/696] ramconsole/apanic: Ensure ramconsole does not get cluttered by apanic threads Signed-off-by: San Mehat --- drivers/misc/apanic.c | 4 ++++ drivers/staging/android/ram_console.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/misc/apanic.c b/drivers/misc/apanic.c index fde0871..2f858be 100644 --- a/drivers/misc/apanic.c +++ b/drivers/misc/apanic.c @@ -38,6 +38,8 @@ #include #include +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 8f18a59..d735be4 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) { -- 1.7.1