diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-10-29 04:47:47 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2014-10-29 04:47:47 -0700 |
| commit | 38ecc4894a55b225cca19f88f47a7397e7b39c2f (patch) | |
| tree | d80e6180b95d13896d6040da68b486223d3d5a68 | |
| parent | 9c362817a7d8f71966c9a7f34ad31e4d5e6e4f42 (diff) | |
| parent | 3793f2c408ade0e2bad22021f5c1d17dfbcc3891 (diff) | |
| download | emulator-kernel-tizen_3.0.m1_tv.tar.gz emulator-kernel-tizen_3.0.m1_tv.tar.bz2 emulator-kernel-tizen_3.0.m1_tv.zip | |
Merge "Revert "uname: Add Emulator specific name"" into tizentizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_mobile/20141120.000000submit/tizen_common/20151229.154718submit/tizen_common/20151229.144031submit/tizen_common/20151229.142028submit/tizen_common/20141029.133645accepted/tizen/common/20141029.134526tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_common
| -rw-r--r-- | kernel/sys.c | 13 |
1 files changed, 1 insertions, 12 deletions
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)) |