Revert "uname: Add Emulator specific name" 40/29540/1 accepted/tizen_3.0.2014.q3_common tizen_3.0.2014.q3_common accepted/tizen/3.0.2014.q3/common/20141029.135305 submit/tizen_3.0.2014.q3_common/20141029.133554 tizen_3.0.2014.q3_common_release
authorAlice Liu <alice.liu@intel.com>
Wed, 29 Oct 2014 10:23:02 +0000 (18:23 +0800)
committerAlice Liu <alice.liu@intel.com>
Wed, 29 Oct 2014 10:25:55 +0000 (18:25 +0800)
This reverts commit 3cbb49dcb48458572169d94bf7ec6015ed748f1b.
This commit is only for Tizen Mobile temporary usage, so
revert it on Tizen Common.

Change-Id: Ibee9079372796504c8f8f1285c970b4cf4cfd2de
Signed-off-by: Alice Liu <alice.liu@intel.com>
kernel/sys.c

index 96fa989d0bc3c09938dcb40be4cea03c958ffb84..c18ecca575b42e0dcc9e12e2fc5c279983d9eb57 100644 (file)
@@ -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))