This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / n_tty.c

diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 0721974..bac378d 100644 (file)
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -62,12 +62,17 @@
 
 static inline unsigned char *alloc_buf(void)
 {
+       unsigned char *p;
        int prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
 
-       if (PAGE_SIZE != N_TTY_BUF_SIZE)
-               return kmalloc(N_TTY_BUF_SIZE, prio);
-       else
-               return (unsigned char *)__get_free_page(prio);
+       if (PAGE_SIZE != N_TTY_BUF_SIZE) {
+               p = kmalloc(N_TTY_BUF_SIZE, prio);
+               if (p)
+                       memset(p, 0, N_TTY_BUF_SIZE);
+       } else
+               p = (unsigned char *)get_zeroed_page(prio);
+
+       return p;
 }
 
 static inline void free_buf(unsigned char *buf)