From 41504c077931565ceb58c79c7d713e2e3843e804 Mon Sep 17 00:00:00 2001 From: William Lee Irwin III <wli@holomorphy.com> Date: Sat, 1 Jan 2005 17:49:03 -0800 Subject: [PATCH] [PATCH] sparc32: remove conflicting definition of _exit() sparc32 had a conflicting _exit, removed the line from asm- sparc/unistd.h. This is the same change that DaveM made to sparc64 here: http://linux.bkbits.net:8080/linux-2.6/diffs/include/asm- sparc64/unistd.h@1.33 Warning was: In file included from include/linux/unistd.h:9, from init/main.c:45: include/asm/unistd.h:489: warning: conflicting types for built-in function '_exit' Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com> Acked-by: William Irwin <wli@holomorphy.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> --- include/asm-sparc/unistd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 7c6e9ae84bd8..89142ca93d44 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h @@ -486,7 +486,6 @@ static __inline__ _syscall1(int,dup,int,fd) static __inline__ _syscall3(int,execve,__const__ char *,file,char **,argv,char **,envp) static __inline__ _syscall3(int,open,__const__ char *,file,int,flag,int,mode) static __inline__ _syscall1(int,close,int,fd) -static __inline__ _syscall1(int,_exit,int,exitcode) static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) #include <linux/linkage.h> -- 2.30.9