[PATCH] Fix CON_BUF_SIZE usage

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

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 7a1e69d27d1cdc31b424a5efde0dc7a2d07870d2..7956dda02f601dd104d8e0fbf122d0bbd7bc0267 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -1888,7 +1888,7 @@ static void do_con_trol(struct tty_struct *tty, unsigned int currcons, int c)
  * 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 --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 383a93cbbeeb1a6d9a37fd505af4db5ff5d611b6..6dbef2f8445a8d7c07b02b781932f29b4126ad30 100644 (file)
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -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 */