From: Maciej Wereski <m.wereski@partner.samsung.com>
Date: Fri, 24 Oct 2014 09:21:16 +0000 (+0200)
Subject: Revert "uname: Add Emulator specific name"
X-Git-Tag: submit/tizen_common/20141029.133645^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3793f2c408ade0e2bad22021f5c1d17dfbcc3891;p=sdk%2Femulator%2Femulator-kernel.git

Revert "uname: Add Emulator specific name"

This commit breaks userspace. systemd > 210 is unable to start, it also
causes problems with RPM.

Bug-Tizen: TC-1908

This reverts commit 3cbb49dcb48458572169d94bf7ec6015ed748f1b.

Change-Id: I46eba1846884f42503874921815eb5fac470fbce
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
---

diff --git a/kernel/sys.c b/kernel/sys.c
index 96fa989d0bc3..c18ecca575b4 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1123,23 +1123,12 @@ static int override_release(char __user *release, size_t len)
 SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name)
 {
 	int errno = 0;
-#ifdef CONFIG_MARU
-	struct new_utsname u;
 
-	down_read(&uts_sem);
-	memcpy(&u, utsname(), sizeof *name);
-	up_read(&uts_sem);
-
-	strcat(u.machine, "_emulated");
-
-	if (copy_to_user(name, &u, sizeof *name))
-		errno = -EFAULT;
-#else
 	down_read(&uts_sem);
 	if (copy_to_user(name, utsname(), sizeof *name))
 		errno = -EFAULT;
 	up_read(&uts_sem);
-#endif
+
 	if (!errno && override_release(name->release, sizeof(name->release)))
 		errno = -EFAULT;
 	if (!errno && override_architecture(name))