From 3793f2c408ade0e2bad22021f5c1d17dfbcc3891 Mon Sep 17 00:00:00 2001 From: Maciej Wereski Date: Fri, 24 Oct 2014 11:21:16 +0200 Subject: [PATCH] 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 --- kernel/sys.c | 13 +------------ 1 file changed, 1 insertion(+), 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)) -- 2.34.1