Oops in do_mounts.c file.

["Dan Aizenstros" <daizenstros@quicklogic.com>]

[-- Attachment #1: Type: text/plain, Size: 689 bytes --]

Hello all,

I am getting an oops in the mount_root function if I
pass root=/dev/nfs to my 2.5.1 kernel.

I am also getting an oops in the mount_block_root
function if I pass root=/dev/hda3 to my 2.5.1 kernel.

The problem appears to be related to the following two
lines in the init/do_mounts.c file:

static char * __initdata root_mount_data;

static char * __initdata root_fs_names;

The __initdata macro appears to be incorrectly used.

In include/linux/init.h the explanation for the macro
says the __initdata should appear after the variable
name.  It also indicates that the variable shoud be
initialized.

The attached patch fixes the problem.

-- Dan A.


[-- Attachment #2: do_mounts.patch --]
[-- Type: application/octet-stream, Size: 658 bytes --]

Index: do_mounts.c
===================================================================
RCS file: /cvs/linux/init/do_mounts.c,v
retrieving revision 1.1
diff -u -r1.1 do_mounts.c
--- do_mounts.c	2001/12/19 00:04:01	1.1
+++ do_mounts.c	2002/01/04 22:02:20
@@ -239,14 +239,14 @@
 
 __setup("root=", root_dev_setup);
 
-static char * __initdata root_mount_data;
+static char * root_mount_data __initdata = NULL;
 static int __init root_data_setup(char *str)
 {
 	root_mount_data = str;
 	return 1;
 }
 
-static char * __initdata root_fs_names;
+static char * root_fs_names __initdata = NULL;
 static int __init fs_names_setup(char *str)
 {
 	root_fs_names = str;