Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5032a50 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] UML - fix utsname build breakage 



Some -mm-only material leaked into a patch destined for mainline, and I didn't
notice.

This was the replacement of system_utsname with utsname() that's required by
the uts namespace patch.  This patch reverts those changes (which are correct
in -mm) so that mainline UML builds again.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6d76fa58

arch/um/kernel/syscall.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -110,7 +110,7 @@ long sys_uname(struct old_utsname __user * name) 
	if (!name)

	if (!name)

		return -EFAULT;

		return -EFAULT;

	down_read(&uts_sem);

	down_read(&uts_sem);

	err = copy_to_user(name, utsname(), sizeof (*name));

	err = copy_to_user(name, &system_utsname, sizeof (*name));

	up_read(&uts_sem);

	up_read(&uts_sem);

	return err?-EFAULT:0;

	return err?-EFAULT:0;

}

}
@@ -126,19 +126,19 @@ long sys_olduname(struct oldold_utsname __user * name) 




  	down_read(&uts_sem);

  	down_read(&uts_sem);





	error = __copy_to_user(&name->sysname, &utsname()->sysname,

	error = __copy_to_user(&name->sysname,&system_utsname.sysname,

			       __OLD_UTS_LEN);

			       __OLD_UTS_LEN);

	error |= __put_user(0,name->sysname+__OLD_UTS_LEN);

	error |= __put_user(0,name->sysname+__OLD_UTS_LEN);

	error |= __copy_to_user(&name->nodename, &utsname()->nodename,

	error |= __copy_to_user(&name->nodename,&system_utsname.nodename,

				__OLD_UTS_LEN);

				__OLD_UTS_LEN);

	error |= __put_user(0,name->nodename+__OLD_UTS_LEN);

	error |= __put_user(0,name->nodename+__OLD_UTS_LEN);

	error |= __copy_to_user(&name->release, &utsname()->release,

	error |= __copy_to_user(&name->release,&system_utsname.release,

				__OLD_UTS_LEN);

				__OLD_UTS_LEN);

	error |= __put_user(0,name->release+__OLD_UTS_LEN);

	error |= __put_user(0,name->release+__OLD_UTS_LEN);

	error |= __copy_to_user(&name->version, &utsname()->version,

	error |= __copy_to_user(&name->version,&system_utsname.version,

				__OLD_UTS_LEN);

				__OLD_UTS_LEN);

	error |= __put_user(0,name->version+__OLD_UTS_LEN);

	error |= __put_user(0,name->version+__OLD_UTS_LEN);

	error |= __copy_to_user(&name->machine, &utsname()->machine,

	error |= __copy_to_user(&name->machine,&system_utsname.machine,

				__OLD_UTS_LEN);

				__OLD_UTS_LEN);

	error |= __put_user(0,name->machine+__OLD_UTS_LEN);

	error |= __put_user(0,name->machine+__OLD_UTS_LEN);