From: Jan Kiszka Date: Mon, 19 Apr 2010 21:53:07 +0000 (+0200) Subject: uml: i386: Avoid redefinition of NR_syscalls X-Git-Tag: v2.6.35-rc1~482^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce60d4d5d50a5454768faa522da98aa5f8070bd0;p=pandora-kernel.git uml: i386: Avoid redefinition of NR_syscalls The i386 subarch happens to pull in original NR_syscalls. Maybe we can make that work for all host arch, but for now just avoid the clash by using an all-upper-case name. CC arch/um/kernel/skas/syscall.o/data/linux-2.6/arch/um/kernel/skas/syscall.c:13:1: warning: "NR_syscalls" redefined In file included from /data/linux-2.6/arch/x86/include/asm/unistd.h:3, from /data/linux-2.6/arch/um/sys-i386/shared/sysdep/syscalls.h:6, from /data/linux-2.6/arch/um/kernel/skas/syscall.c:10: /data/linux-2.6/arch/x86/include/asm/unistd_32.h:349:1: warning: this is the location of the previous definition Signed-off-by: Jan Kiszka Signed-off-by: Jiri Kosina --- Reading git-diff-tree failed