Set uts.machine to i386 on intel 32bit platforms.

Change-Id: Ic0833843f0d3e3df50fcbde11b453b846f0d4f33
This commit is contained in:
Lionel Sambuc 2014-09-05 15:35:17 +02:00
parent 3f072cf30f
commit ea36b58e62
2 changed files with 2 additions and 8 deletions

View file

@ -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) if (ipc_sendrec(VFS_PROC_NR, &mess) != OK || mess.m_type != OK)
panic("can't sync up with VFS"); 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(); system_hz = sys_hz();
/* Initialize user-space scheduling. */ /* Initialize user-space scheduling. */

View file

@ -32,10 +32,11 @@ struct utsname uts_val = {
"noname", /* node/network name */ "noname", /* node/network name */
OS_RELEASE, /* O.S. release (e.g. 3.3.0) */ OS_RELEASE, /* O.S. release (e.g. 3.3.0) */
OS_VERSION, /* O.S. version (e.g. Minix 3.3.0 (GENERIC)) */ OS_VERSION, /* O.S. version (e.g. Minix 3.3.0 (GENERIC)) */
"xyzzy", /* machine (cpu) type (filled in later) */
#if defined(__i386__) #if defined(__i386__)
"i386", /* machine (cpu) type */
"i386", /* architecture */ "i386", /* architecture */
#elif defined(__arm__) #elif defined(__arm__)
"arm", /* machine (cpu) type */
"arm", /* architecture */ "arm", /* architecture */
#else #else
#error /* oops, no 'uname -mk' */ #error /* oops, no 'uname -mk' */