From e200624bcde84602d8637820c0437720c5cebefe Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Fri, 20 Jul 2012 17:27:54 -0700 Subject: [PATCH] --- yaml --- r: 312147 b: refs/heads/master c: 1b499d05eecbe04969516717a8e15afb6ad80689 h: refs/heads/master i: 312145: 9e8f3570331d023a7fe1d044c5ac58fcce0cf946 312143: f3929817eda858c9913db2e8a98adc3b6f65718d v: v3 --- [refs] | 2 +- trunk/kernel/debug/kdb/kdb_private.h | 1 - trunk/kernel/printk.c | 15 --------------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index c016bb52a11f..859183f014e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc792e612e78a24ae0b30cc5b85f2368379ba4d4 +refs/heads/master: 1b499d05eecbe04969516717a8e15afb6ad80689 diff --git a/trunk/kernel/debug/kdb/kdb_private.h b/trunk/kernel/debug/kdb/kdb_private.h index 47c4e56e513b..392ec6a25844 100644 --- a/trunk/kernel/debug/kdb/kdb_private.h +++ b/trunk/kernel/debug/kdb/kdb_private.h @@ -205,7 +205,6 @@ extern char kdb_grep_string[]; extern int kdb_grep_leading; extern int kdb_grep_trailing; extern char *kdb_cmds[]; -extern void kdb_syslog_data(char *syslog_data[]); extern unsigned long kdb_task_state_string(const char *); extern char kdb_task_state_char (const struct task_struct *); extern unsigned long kdb_task_state(const struct task_struct *p, diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 177fa49357a5..c8129678dfbf 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -1192,21 +1192,6 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) return do_syslog(type, buf, len, SYSLOG_FROM_CALL); } -#ifdef CONFIG_KGDB_KDB -/* kdb dmesg command needs access to the syslog buffer. do_syslog() - * uses locks so it cannot be used during debugging. Just tell kdb - * where the start and end of the physical and logical logs are. This - * is equivalent to do_syslog(3). - */ -void kdb_syslog_data(char *syslog_data[4]) -{ - syslog_data[0] = log_buf; - syslog_data[1] = log_buf + log_buf_len; - syslog_data[2] = log_buf + log_first_idx; - syslog_data[3] = log_buf + log_next_idx; -} -#endif /* CONFIG_KGDB_KDB */ - static bool __read_mostly ignore_loglevel; static int __init ignore_loglevel_setup(char *str)