From df9334d3d1a7aade09f85bfaaffc36ab486174cf Mon Sep 17 00:00:00 2001
From: Rodolfo Giometti <giometti@linux.it>
Date: Wed, 10 Mar 2010 15:23:46 -0800
Subject: [PATCH] --- yaml --- r: 187300 b: refs/heads/master c:
 572b9adbd40b5565dc413db04af9cc234f72bf19 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/char/n_tty.c | 17 +++++++++++++++++
 trunk/include/linux/tty.h  |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bae31098b6dc..236cf349ddf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3e63afe8a74c0134d05a551cc74facc3b3ec0d7
+refs/heads/master: 572b9adbd40b5565dc413db04af9cc234f72bf19
diff --git a/trunk/drivers/char/n_tty.c b/trunk/drivers/char/n_tty.c
index 2e50f4dfc79c..bdae8327143c 100644
--- a/trunk/drivers/char/n_tty.c
+++ b/trunk/drivers/char/n_tty.c
@@ -48,6 +48,7 @@
 #include <linux/audit.h>
 #include <linux/file.h>
 #include <linux/uaccess.h>
+#include <linux/module.h>
 
 #include <asm/system.h>
 
@@ -2091,3 +2092,19 @@ struct tty_ldisc_ops tty_ldisc_N_TTY = {
 	.receive_buf     = n_tty_receive_buf,
 	.write_wakeup    = n_tty_write_wakeup
 };
+
+/**
+ *	n_tty_inherit_ops	-	inherit N_TTY methods
+ *	@ops: struct tty_ldisc_ops where to save N_TTY methods
+ *
+ *	Used by a generic struct tty_ldisc_ops to easily inherit N_TTY
+ *	methods.
+ */
+
+void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
+{
+	*ops = tty_ldisc_N_TTY;
+	ops->owner = NULL;
+	ops->refcount = ops->flags = 0;
+}
+EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h
index d96e5882f129..568369a86306 100644
--- a/trunk/include/linux/tty.h
+++ b/trunk/include/linux/tty.h
@@ -514,6 +514,7 @@ extern void tty_ldisc_enable(struct tty_struct *tty);
 
 /* n_tty.c */
 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
+extern void n_tty_inherit_ops(struct tty_ldisc_ops *ops);
 
 /* tty_audit.c */
 #ifdef CONFIG_AUDIT