diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /drivers/net/ppp_async.c | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'drivers/net/ppp_async.c')
| -rw-r--r-- | drivers/net/ppp_async.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index 6de8399d6dd9..17c116bb332c 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c | |||
| @@ -356,7 +356,6 @@ ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf, | |||
| 356 | if (!skb_queue_empty(&ap->rqueue)) | 356 | if (!skb_queue_empty(&ap->rqueue)) |
| 357 | tasklet_schedule(&ap->tsk); | 357 | tasklet_schedule(&ap->tsk); |
| 358 | ap_put(ap); | 358 | ap_put(ap); |
| 359 | tty_unthrottle(tty); | ||
| 360 | } | 359 | } |
| 361 | 360 | ||
| 362 | static void | 361 | static void |