Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c
index d2fa2db13586..52938da1e542 100644
--- a/drivers/net/ppp_synctty.c
+++ b/drivers/net/ppp_synctty.c
@@ -44,6 +44,7 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 
 #define PPP_VERSION     "2.4.2"
@@ -378,10 +379,7 @@ ppp_sync_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
         return 0;
 }
 
-/*
- * This can now be called from hard interrupt level as well
- * as soft interrupt level or mainline.
- */
+/* May sleep, don't call from interrupt level or with interrupts disabled */
 static void
 ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf,
                   char *cflags, int count)
@@ -665,8 +663,8 @@ ppp_sync_push(struct syncppp *ap)
                 }
                 /* haven't made any progress */
                 spin_unlock_bh(&ap->xmit_lock);
-                if (!(test_bit(XMIT_WAKEUP, &ap->xmit_flags)
-                      || (!tty_stuffed && ap->tpkt)))
+                if (!(test_bit(XMIT_WAKEUP, &ap->xmit_flags) ||
+                      (!tty_stuffed && ap->tpkt)))
                         break;
                 if (!spin_trylock_bh(&ap->xmit_lock))
                         break;