Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / include / asm-i386 / unistd.h

diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 58d12cf..0df3f9b 100644 (file)
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -292,7 +292,6 @@
 
 #define NR_syscalls 284
 
-#ifndef __KERNEL_SYSCALLS_NO_ERRNO__
 /* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
 
 #define __syscall_return(type, res) \
@@ -304,10 +303,6 @@ do { \
        return (type) (res); \
 } while (0)
 
-#else
-# define __syscall_return(type, res) return (type) (res)
-#endif
-
 /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
 #define _syscall0(type,name) \
 type name(void) \
@@ -439,8 +434,6 @@ 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 _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-static inline _syscall1(long,chroot,char *,filename)
-static inline _syscall1(long,chdir,char *,filename)
 
 asmlinkage int sys_modify_ldt(int func, void __user *ptr, unsigned long bytecount);
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,