From 05f5dc15586dbb4928c4ae4428756cde210185e1 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 6 Aug 2010 16:34:43 +0100
Subject: [PATCH] --- yaml --- r: 205191 b: refs/heads/master c:
 31d1d48e199e99077fb30f6fb9a793be7bec756f h: refs/heads/master i:   205189:
 ae72c535ee7154d4b8b17bca8691f99b073f647a   205187:
 b2232cae46573dddde16ad4c7a326c3379aebfeb   205183:
 2b2bbeedcf7a18f1d26579cc6e75f35d5277a906 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/mem.c    | 2 +-
 trunk/drivers/char/tty_io.c | 4 ++--
 trunk/fs/char_dev.c         | 1 +
 trunk/include/linux/tty.h   | 3 +++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 19cf10cc9f7c..f7f22d18d430 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e456a124353a753e9d1fadfbf5cd459c2f197ae
+refs/heads/master: 31d1d48e199e99077fb30f6fb9a793be7bec756f
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index f54dab8acdcd..a398ecdbd758 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -916,7 +916,7 @@ static int __init chr_dev_init(void)
 			      NULL, devlist[minor].name);
 	}
 
-	return 0;
+	return tty_init();
 }
 
 fs_initcall(chr_dev_init);
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index d71f0fc34b46..507441ac6edb 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -3128,7 +3128,7 @@ static struct cdev tty_cdev, console_cdev;
  * Ok, now we can initialize the rest of the tty devices and can count
  * on memory allocations, interrupts etc..
  */
-static int __init tty_init(void)
+int __init tty_init(void)
 {
 	cdev_init(&tty_cdev, &tty_fops);
 	if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
@@ -3149,4 +3149,4 @@ static int __init tty_init(void)
 #endif
 	return 0;
 }
-module_init(tty_init);
+
diff --git a/trunk/fs/char_dev.c b/trunk/fs/char_dev.c
index d6db933df2b2..f80a4f25123c 100644
--- a/trunk/fs/char_dev.c
+++ b/trunk/fs/char_dev.c
@@ -20,6 +20,7 @@
 #include <linux/cdev.h>
 #include <linux/mutex.h>
 #include <linux/backing-dev.h>
+#include <linux/tty.h>
 
 #include "internal.h"
 
diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h
index 931078b73226..7802a243ee13 100644
--- a/trunk/include/linux/tty.h
+++ b/trunk/include/linux/tty.h
@@ -552,6 +552,9 @@ static inline void tty_audit_push_task(struct task_struct *tsk,
 }
 #endif
 
+/* tty_io.c */
+extern int __init tty_init(void);
+
 /* tty_ioctl.c */
 extern int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
 		       unsigned int cmd, unsigned long arg);