diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-26 01:58:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-26 01:58:05 +0100 |
| commit | 509dceef6470442d8c7b8a43ec34125205840b3c (patch) | |
| tree | b02f0a55bf98aa5e7d44698cc80e23a01a41edef | |
| parent | x86, bts, ftrace: a BTS ftrace plug-in prototype (diff) | |
| parent | tracing, tty: fix warnings caused by branch tracing and tty_kref_get() (diff) | |
| download | linux-509dceef6470442d8c7b8a43ec34125205840b3c.tar.xz linux-509dceef6470442d8c7b8a43ec34125205840b3c.zip | |
Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing/core
| -rw-r--r-- | include/linux/tty.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 3b8121d4e36f..eaec37c9d83d 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); |