Update of /cvsroot/linux-vax/kernel-2.4/fs/devpts
In directory usw-pr-cvs1:/tmp/cvs-serv27691/devpts
Modified Files:
inode.c
Log Message:
sync 2.4.15 commit 11
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/devpts/inode.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- inode.c 25 Feb 2001 23:14:48 -0000 1.1.1.2
+++ inode.c 9 Apr 2002 13:11:17 -0000 1.2
@@ -220,7 +220,7 @@
}
}
-int __init init_devpts_fs(void)
+static int __init init_devpts_fs(void)
{
int err = register_filesystem(&devpts_fs_type);
if (!err) {
@@ -228,28 +228,27 @@
err = PTR_ERR(devpts_mnt);
if (!IS_ERR(devpts_mnt))
err = 0;
- }
- return err;
-}
-
#ifdef MODULE
-
-int init_module(void)
-{
- int err = init_devpts_fs();
- if ( !err ) {
- devpts_upcall_new = devpts_pty_new;
- devpts_upcall_kill = devpts_pty_kill;
+ if ( !err ) {
+ devpts_upcall_new = devpts_pty_new;
+ devpts_upcall_kill = devpts_pty_kill;
+ }
+#endif
}
return err;
}
-void cleanup_module(void)
+static void __exit exit_devpts_fs(void)
{
+#ifdef MODULE
devpts_upcall_new = NULL;
devpts_upcall_kill = NULL;
+#endif
unregister_filesystem(&devpts_fs_type);
kern_umount(devpts_mnt);
}
-#endif
+module_init(init_devpts_fs)
+module_exit(exit_devpts_fs)
+MODULE_LICENSE("GPL");
+
|
