From: Matt Mackall <mpm@selenic.com>

Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/drivers/char/vt.c       |    2 +-
 25-akpm/include/linux/vt_kern.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/char/vt.c~fix-con_buf_size-usage drivers/char/vt.c
--- 25/drivers/char/vt.c~fix-con_buf_size-usage	2004-07-31 17:12:28.188286640 -0700
+++ 25-akpm/drivers/char/vt.c	2004-07-31 17:12:28.204284208 -0700
@@ -1888,7 +1888,7 @@ static void do_con_trol(struct tty_struc
  * since console_init (and thus con_init) are called before any
  * kernel memory allocation is available.
  */
-char con_buf[PAGE_SIZE];
+char con_buf[CON_BUF_SIZE];
 DECLARE_MUTEX(con_buf_sem);
 
 /* acquires console_sem */
diff -puN include/linux/vt_kern.h~fix-con_buf_size-usage include/linux/vt_kern.h
--- 25/include/linux/vt_kern.h~fix-con_buf_size-usage	2004-07-31 17:12:28.190286336 -0700
+++ 25-akpm/include/linux/vt_kern.h	2004-07-31 17:12:28.204284208 -0700
@@ -93,8 +93,8 @@ void reset_vc(unsigned int new_console);
  * vc_screen.c shares this temporary buffer with the console write code so that
  * we can easily avoid touching user space while holding the console spinlock.
  */
-extern char con_buf[PAGE_SIZE];
 #define CON_BUF_SIZE	PAGE_SIZE
+extern char con_buf[CON_BUF_SIZE];
 extern struct semaphore con_buf_sem;
 
 #endif /* _VT_KERN_H */
_