From f32f7a1727682980c0fef77a68505db6518b8b81 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 15 Jan 2010 17:01:11 -0800 Subject: [PATCH] --- yaml --- r: 179344 b: refs/heads/master c: 2427b8e3eaea3719e53bbed7b3375382c3aa6f13 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/tty.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 66405e3832f2..57b19bdc5841 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 118f3e1afd5534c15f9701f33514186cfc841a27 +refs/heads/master: 2427b8e3eaea3719e53bbed7b3375382c3aa6f13 diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h index ef3a2947b102..6abfcf5b5887 100644 --- a/trunk/include/linux/tty.h +++ b/trunk/include/linux/tty.h @@ -464,7 +464,7 @@ extern int tty_port_alloc_xmit_buf(struct tty_port *port); extern void tty_port_free_xmit_buf(struct tty_port *port); extern void tty_port_put(struct tty_port *port); -extern inline struct tty_port *tty_port_get(struct tty_port *port) +static inline struct tty_port *tty_port_get(struct tty_port *port) { if (port) kref_get(&port->kref); @@ -486,7 +486,7 @@ extern void tty_port_close(struct tty_port *port, struct tty_struct *tty, struct file *filp); extern int tty_port_open(struct tty_port *port, struct tty_struct *tty, struct file *filp); -extern inline int tty_port_users(struct tty_port *port) +static inline int tty_port_users(struct tty_port *port) { return port->count + port->blocked_open; }