From ea36b58e62e0b8cfeae6104541fe569eda34d629 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Fri, 5 Sep 2014 15:35:17 +0200
Subject: [PATCH] Set uts.machine to i386 on intel 32bit platforms.

Change-Id: Ic0833843f0d3e3df50fcbde11b453b846f0d4f33
---
 minix/servers/pm/main.c | 7 -------
 minix/servers/pm/misc.c | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/minix/servers/pm/main.c b/minix/servers/pm/main.c
index 523e8c491..3e5004baf 100644
--- a/minix/servers/pm/main.c
+++ b/minix/servers/pm/main.c
@@ -233,13 +233,6 @@ static int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
   if (ipc_sendrec(VFS_PROC_NR, &mess) != OK || mess.m_type != OK)
 	panic("can't sync up with VFS");
 
-#if defined(__i386__)
-        uts_val.machine[0] = 'i';
-        strcpy(uts_val.machine + 1, itoa(getprocessor()));
-#elif defined(__arm__)
-        strcpy(uts_val.machine, "arm");
-#endif  
-
  system_hz = sys_hz();
 
   /* Initialize user-space scheduling. */
diff --git a/minix/servers/pm/misc.c b/minix/servers/pm/misc.c
index 74076f219..8014f63d7 100644
--- a/minix/servers/pm/misc.c
+++ b/minix/servers/pm/misc.c
@@ -32,10 +32,11 @@ struct utsname uts_val = {
   "noname",		/* node/network name */
   OS_RELEASE,		/* O.S. release (e.g. 3.3.0) */
   OS_VERSION,		/* O.S. version (e.g. Minix 3.3.0 (GENERIC)) */
-  "xyzzy",		/* machine (cpu) type (filled in later) */
 #if defined(__i386__)
+  "i386",		/* machine (cpu) type */
   "i386",		/* architecture */
 #elif defined(__arm__)
+  "arm",		/* machine (cpu) type */
   "arm",		/* architecture */
 #else
 #error			/* oops, no 'uname -mk' */