Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing/core

509dceef · Ingo Molnar · 1e9b51c2 · 14bfc987 · 509dceef
Commit 509dceef authored 16 years ago by Ingo Molnar
--- 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);