uml: i386: Avoid redefinition of NR_syscalls
authorJan Kiszka <jan.kiszka@web.de>
Mon, 19 Apr 2010 21:53:07 +0000 (23:53 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 10 May 2010 21:38:15 +0000 (23:38 +0200)
commitce60d4d5d50a5454768faa522da98aa5f8070bd0
tree4a81d5b5e317565604ef9fabc515184b88f70148
parenta8cd4561ea176f51e9f4707873ca4eff8fd5ee70
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 <jan.kiszka@web.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
arch/um/kernel/skas/syscall.c