From: Andrew Morton <akpm@osdl.org>

arch/alpha/kernel/osf_sys.c: In function `osf_sysinfo':
arch/alpha/kernel/osf_sys.c:611: error: initializer element is not constant
arch/alpha/kernel/osf_sys.c:611: error: (near initialization for `sysinfo_table[0]')
arch/alpha/kernel/osf_sys.c:612: error: initializer element is not constant
arch/alpha/kernel/osf_sys.c:612: error: (near initialization for `sysinfo_table[1]')
arch/alpha/kernel/osf_sys.c:613: error: initializer element is not constant
arch/alpha/kernel/osf_sys.c:613: error: (near initialization for `sysinfo_table[2]')
arch/alpha/kernel/osf_sys.c:614: error: initializer element is not constant
arch/alpha/kernel/osf_sys.c:614: error: (near initialization for `sysinfo_table[3]')
arch/alpha/kernel/osf_sys.c:615: error: initializer element is not constant
arch/alpha/kernel/osf_sys.c:615: error: (near initialization for `sysinfo_table[4]')

Cc: Serge E. Hallyn <serue@us.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Andrey Savochkin <saw@sw.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/alpha/kernel/osf_sys.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/alpha/kernel/osf_sys.c~namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix arch/alpha/kernel/osf_sys.c
--- 25-alpha/arch/alpha/kernel/osf_sys.c~namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix	2006-05-20 01:04:57.000000000 -0700
+++ 25-alpha-akpm/arch/alpha/kernel/osf_sys.c	2006-05-20 01:05:06.000000000 -0700
@@ -607,7 +607,7 @@ osf_sigstack(struct sigstack __user *uss
 asmlinkage long
 osf_sysinfo(int command, char __user *buf, long count)
 {
-	static char * sysinfo_table[] = {
+	char *sysinfo_table[] = {
 		utsname()->sysname,
 		utsname()->nodename,
 		utsname()->release,
_