History

[PATCH] clean up kernel messages

Arrange for all kernel printks to be no-ops. Only available if CONFIG_EMBEDDED. This patch saves about 375k on my laptop config and nearly 100k on minimal configs.

Matt Mackall committed 21 years ago

Commit d59745c1 parent cd7619d4 files · +43 −6Browse files

Showing the changes to kernel (1 of 4 files). Show all

Unified · Split

kernel/printk.c+21−6
@@ -85,10 +85,6 @@ static int console_locked; · 84 unmodified lines
8585 */
8686 static DEFINE_SPINLOCK(logbuf_lock);
8787
88−static char __log_buf[__LOG_BUF_LEN];
89−static char *log_buf = __log_buf;
90−static int log_buf_len = __LOG_BUF_LEN;
91−
9288 #define LOG_BUF_MASK (log_buf_len-1)
9389 #define LOG_BUF(idx) (log_buf[(idx) & LOG_BUF_MASK])
9490
@@ -99,7 +95,6 @@ static int log_buf_len = __LOG_BUF_LEN; · 4 unmodified lines
9995 static unsigned long log_start; /* Index into log_buf: next char to be read by syslog() */
10096 static unsigned long con_start; /* Index into log_buf: next char to be sent to consoles */
10197 static unsigned long log_end; /* Index into log_buf: most-recently-written-char + 1 */
102−static unsigned long logged_chars; /* Number of chars produced since last read+clear operation */
10398
10499 /*
105100 * Array of consoles built from command line options (console=)
@@ -120,6 +115,13 @@ static int preferred_console = -1; · 14 unmodified lines
120115 /* Flag: console code may call schedule() */
121116 static int console_may_schedule;
122117
118+#ifdef CONFIG_PRINTK
119+
120+static char __log_buf[__LOG_BUF_LEN];
121+static char *log_buf = __log_buf;
122+static int log_buf_len = __LOG_BUF_LEN;
123+static unsigned long logged_chars; /* Number of chars produced since last read+clear operation */
124+
123125 /*
124126 * Setup a list of consoles. Called from init/main.c
125127 */
@@ -535,6 +537,7 @@ __setup("time", printk_time_setup); · 409 unmodified lines
535537 * then changes console_loglevel may break. This is because console_loglevel
536538 * is inspected when the actual printing occurs.
537539 */
540+
538541 asmlinkage int printk(const char *fmt, ...)
539542 {
540543 va_list args;
@@ -655,6 +658,18 @@ out: · 114 unmodified lines
655658 EXPORT_SYMBOL(printk);
656659 EXPORT_SYMBOL(vprintk);
657660
661+#else
662+
663+asmlinkage long sys_syslog(int type, char __user * buf, int len)
664+{
665+ return 0;
666+}
667+
668+int do_syslog(int type, char __user * buf, int len) { return 0; }
669+static void call_console_drivers(unsigned long start, unsigned long end) {}
670+
671+#endif
672+
658673 /**
659674 * acquire_console_sem - lock the console system for exclusive use.
660675 *
@@ -931,7 +946,7 @@ int unregister_console(struct console * console) · 270 unmodified lines
931946 return res;
932947 }
933948 EXPORT_SYMBOL(unregister_console);
934−
949+
935950 /**
936951 * tty_write_message - write a message to a certain tty, not just the console.
937952 *