From c27ed464bbb809d97561341ac132cf2eadbb356f Mon Sep 17 00:00:00 2001 From: San Mehat Date: Tue, 23 Feb 2010 16:09:47 -0800 Subject: [PATCH] --- yaml --- r: 281202 b: refs/heads/master c: 3537cdaa16205d2af7e1195276c786f22bada574 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/logger.c | 7 +++++++ trunk/drivers/staging/android/logger.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 636e51aa8b6b..9ba420479b3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0445f1548fc66a72f3b91cdbe8f26b120245efd1 +refs/heads/master: 3537cdaa16205d2af7e1195276c786f22bada574 diff --git a/trunk/drivers/staging/android/logger.c b/trunk/drivers/staging/android/logger.c index dd765649c03d..531bdbeede89 100644 --- a/trunk/drivers/staging/android/logger.c +++ b/trunk/drivers/staging/android/logger.c @@ -558,6 +558,7 @@ static struct logger_log VAR = { \ DEFINE_LOGGER_DEVICE(log_main, LOGGER_LOG_MAIN, 64*1024) DEFINE_LOGGER_DEVICE(log_events, LOGGER_LOG_EVENTS, 256*1024) DEFINE_LOGGER_DEVICE(log_radio, LOGGER_LOG_RADIO, 64*1024) +DEFINE_LOGGER_DEVICE(log_system, LOGGER_LOG_SYSTEM, 64*1024) static struct logger_log *get_log_from_minor(int minor) { @@ -567,6 +568,8 @@ static struct logger_log *get_log_from_minor(int minor) return &log_events; if (log_radio.misc.minor == minor) return &log_radio; + if (log_system.misc.minor == minor) + return &log_system; return NULL; } @@ -603,6 +606,10 @@ static int __init logger_init(void) if (unlikely(ret)) goto out; + ret = init_log(&log_system); + if (unlikely(ret)) + goto out; + out: return ret; } diff --git a/trunk/drivers/staging/android/logger.h b/trunk/drivers/staging/android/logger.h index a562434d7419..2cb06e9d8f98 100644 --- a/trunk/drivers/staging/android/logger.h +++ b/trunk/drivers/staging/android/logger.h @@ -32,6 +32,7 @@ struct logger_entry { #define LOGGER_LOG_RADIO "log_radio" /* radio-related messages */ #define LOGGER_LOG_EVENTS "log_events" /* system/hardware events */ +#define LOGGER_LOG_SYSTEM "log_system" /* system/framework messages */ #define LOGGER_LOG_MAIN "log_main" /* everything else */ #define LOGGER_ENTRY_MAX_LEN (4*1024)