diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 42db0551c3aa..62a47eafa8e9 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
@@ -361,13 +361,13 @@ out: | |||
361 | #ifdef CONFIG_ROOT_NFS | 361 | #ifdef CONFIG_ROOT_NFS |
362 | static int __init mount_nfs_root(void) | 362 | static int __init mount_nfs_root(void) |
363 | { | 363 | { |
364 | void *data = nfs_root_data(); | 364 | char *root_dev, *root_data; |
365 | 365 | ||
366 | create_dev("/dev/root", ROOT_DEV); | 366 | if (nfs_root_data(&root_dev, &root_data) != 0) |
367 | if (data && | 367 | return 0; |
368 | do_mount_root("/dev/root", "nfs", root_mountflags, data) == 0) | 368 | if (do_mount_root(root_dev, "nfs", root_mountflags, root_data) != 0) |
369 | return 1; | 369 | return 0; |
370 | return 0; | 370 | return 1; |
371 | } | 371 | } |
372 | #endif | 372 | #endif |
373 | 373 | ||