From 488326a46e44defc0371550d7bff21e95b140f3c Mon Sep 17 00:00:00 2001 From: Tilman Schmidt Date: Thu, 1 Oct 2009 04:28:44 +0000 Subject: [PATCH] --- yaml --- r: 170460 b: refs/heads/master c: 92d326f61b553250780786e9dd8609d4b32f8de7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ppp_async.c | 5 +---- trunk/drivers/net/ppp_synctty.c | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index e1db6a91e11b..d3878dc1fa71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a549952ad323d68daf5b50bf716db895479af84c +refs/heads/master: 92d326f61b553250780786e9dd8609d4b32f8de7 diff --git a/trunk/drivers/net/ppp_async.c b/trunk/drivers/net/ppp_async.c index 6de8399d6dd9..30b1b3326765 100644 --- a/trunk/drivers/net/ppp_async.c +++ b/trunk/drivers/net/ppp_async.c @@ -337,10 +337,7 @@ ppp_asynctty_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_asynctty_receive(struct tty_struct *tty, const unsigned char *buf, char *cflags, int count) diff --git a/trunk/drivers/net/ppp_synctty.c b/trunk/drivers/net/ppp_synctty.c index d2fa2db13586..c908b08dc981 100644 --- a/trunk/drivers/net/ppp_synctty.c +++ b/trunk/drivers/net/ppp_synctty.c @@ -378,10 +378,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)