[patch] 2.3.99-pre3-6: nfsroot.c __setup function

From: Tim Waugh (twaugh@redhat.com)
Date: Wed Mar 22 2000 - 10:35:34 EST


Here is a patch to fix nfs_root_setup. It's currently returning void
rather than int.

Tim.
*/

Index: linux/fs/nfs/nfsroot.c
diff -u linux/fs/nfs/nfsroot.c:1.1.1.3 linux/fs/nfs/nfsroot.c:1.2
--- linux/fs/nfs/nfsroot.c:1.1.1.3 Wed Mar 22 09:15:35 2000
+++ linux/fs/nfs/nfsroot.c Wed Mar 22 15:08:08 2000
@@ -322,7 +322,7 @@
  * Parse NFS server and directory information passed on the kernel
  * command line.
  */
-void __init nfs_root_setup(char *line)
+int __init nfs_root_setup(char *line)
 {
         ROOT_DEV = MKDEV(UNNAMED_MAJOR, 255);
         if (line[0] == '/' || line[0] == ',' || (line[0] >= '0' && line[0] <= '9')) {
@@ -335,6 +335,7 @@
                 sprintf(nfs_root_name, NFS_ROOT, line);
         }
         root_nfs_parse_addr(nfs_root_name);
+ return 1;
 }
 
 __setup("nfsroot=", nfs_root_setup);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Mar 23 2000 - 21:00:36 EST