From: "Serge E. Hallyn" <serue@us.ibm.com>

git-klibc.patch nuked fs/nfs/nfsroot.c.  Save this hunk for later.

Cc: Serge Hallyn <serue@us.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Andrey Savochkin <saw@sw.ru>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/nfs/nfsroot.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/nfs/nfsroot.c~namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-2 fs/nfs/nfsroot.c
--- devel/fs/nfs/nfsroot.c~namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-2	2006-05-21 14:52:09.000000000 -0700
+++ devel-akpm/fs/nfs/nfsroot.c	2006-05-21 14:52:09.000000000 -0700
@@ -312,7 +312,7 @@ static int __init root_nfs_name(char *na
 	/* Override them by options set on kernel command-line */
 	root_nfs_parse(name, buf);
 
-	cp = system_utsname.nodename;
+	cp = utsname()->nodename;
 	if (strlen(buf) + strlen(cp) > NFS_MAXPATHLEN) {
 		printk(KERN_ERR "Root-NFS: Pathname for remote directory too long.\n");
 		return -1;
_