[Linux-mips-commits]CVS: linux/kernel printk.c,1.6,1.7

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv23524/kernel

Modified Files:
	printk.c 
Log Message:
Sync with OSS 2.4.14.



Index: printk.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/kernel/printk.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- printk.c	2001/10/19 21:19:40	1.6
+++ printk.c	2001/11/06 09:10:22	1.7
@@ -24,10 +24,18 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>			/* For in_interrupt() */
+#include <linux/config.h>
 
 #include <asm/uaccess.h>
 
+#ifdef CONFIG_MULTIQUAD
+#define LOG_BUF_LEN	(65536)
+#elif defined(CONFIG_SMP)
+#define LOG_BUF_LEN	(32768)
+#else	
 #define LOG_BUF_LEN	(16384)			/* This must be a power of two */
+#endif
+
 #define LOG_BUF_MASK	(LOG_BUF_LEN-1)
 
 /* printk's without a loglevel use this.. */