make nfsroot compile

PATCH New Peter Buckingham 1 participant 1 message Sep 9, 2004 MIPS

lore

Share & tools

lore

Peter Buckingham

author

2004-09-09 20:54 UTC #0 lore raw

PATCH 1/1 make nfsroot compile

Hi Ralf,

I needed to merge this fix in from Linus's tree to make things work with a NFS root. Now I can boot up broadcom's 1250 :-D

peter

Signed-off-by Peter Buckingham <[email protected]>

Index: fs/nfs/nfsroot.c
===================================================================
RCS file: /home/cvs/linux/fs/nfs/nfsroot.c,v
retrieving revision 1.30

nfs/nfsroot.c +4 -2

diff -u -r1.30 nfsroot.c
@@ -495,8 +495,10 @@
 	if (status < 0)
 		printk(KERN_ERR "Root-NFS: Server returned error %d "
 				"while mounting %s\n", status, nfs_path);
-	else
-		nfs_copy_fh(nfs_data.root, fh);
+	else {
+		nfs_data.root.size=fh.size;
+		memcpy(nfs_data.root.data, fh.data, fh.size);
+	}
 
 	return status;
 }