summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-25 08:58:11 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-25 08:59:44 +0100
commit14bfc987e395797dfe03e915e8b4c7fc9e5078e4 (patch)
tree660992b9d637e3055b0479ebabfdfdf0bd0cb004
parent0429149fb5e01edc410648591c19095d2074ee00 (diff)
downloadop-kernel-dev-14bfc987e395797dfe03e915e8b4c7fc9e5078e4.zip
op-kernel-dev-14bfc987e395797dfe03e915e8b4c7fc9e5078e4.tar.gz
tracing, tty: fix warnings caused by branch tracing and tty_kref_get()
Stephen Rothwell reported tht this warning started triggering in linux-next: In file included from init/main.c:27: include/linux/tty.h: In function ‘tty_kref_get’: include/linux/tty.h:330: warning: ‘______f’ is static but declared in inline function ‘tty_kref_get’ which is not static Which gcc emits for 'extern inline' functions that nevertheless define static variables. Change it to 'static inline', which is the norm in the kernel anyway. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/tty.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 3b8121d..eaec37c 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -325,7 +325,7 @@ extern struct class *tty_class;
* go away
*/
-extern inline struct tty_struct *tty_kref_get(struct tty_struct *tty)
+static inline struct tty_struct *tty_kref_get(struct tty_struct *tty)
{
if (tty)
kref_get(&tty->kref);
OpenPOWER on IntegriCloud