From 263ec1e885d1375c85868f872eeaa84a0517f1b6 Mon Sep 17 00:00:00 2001 From: Arun Thomas Date: Sat, 11 Aug 2012 17:45:06 +0200 Subject: [PATCH] pm: update for ARM --- servers/pm/main.c | 2 ++ servers/pm/misc.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/servers/pm/main.c b/servers/pm/main.c index a7981019a..e870d7703 100644 --- a/servers/pm/main.c +++ b/servers/pm/main.c @@ -288,6 +288,8 @@ static int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info)) #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(); diff --git a/servers/pm/misc.c b/servers/pm/misc.c index c052a7d83..dbe979fbf 100644 --- a/servers/pm/misc.c +++ b/servers/pm/misc.c @@ -36,8 +36,10 @@ struct utsname uts_val = { OS_RELEASE, /* O.S. release (e.g. 1.5) */ OS_VERSION, /* O.S. version (e.g. 10) */ "xyzzy", /* machine (cpu) type (filled in later) */ -#if __i386 +#if defined(__i386__) "i386", /* architecture */ +#elif defined(__arm__) + "arm", /* architecture */ #else #error /* oops, no 'uname -mk' */ #endif