Commit 56142536 authored by David Woodhouse's avatar David Woodhouse Committed by David Woodhouse
Browse files

Remove unneeded _syscallX macros from user view in asm-*/unistd.h 



These aren't needed by glibc or klibc, and they're broken in some cases
anyway. The uClibc folks are apparently switching over to stop using
them too (now that we agreed that they should be dropped, at least).

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 34c278d3

include/asm-alpha/unistd.h

+4 −3
Original line number Diff line number Diff line
@@ -383,6 +383,8 @@ 
#define __NR_inotify_add_watch		445

#define __NR_inotify_rm_watch		446



#ifdef __KERNEL__



#define NR_SYSCALLS			447



#if defined(__GNUC__)
@@ -565,9 +567,8 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\ 
	_syscall_return(type);						\

}



#endif /* __LIBRARY__ && __GNUC__ */

#endif /* __GNUC__ */



#ifdef __KERNEL__

#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_STAT64
@@ -578,7 +579,6 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\ 
#define __ARCH_WANT_SYS_OLD_GETRLIMIT

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_SIGPENDING

#endif



#ifdef __KERNEL_SYSCALLS__
@@ -661,4 +661,5 @@ asmlinkage long sys_rt_sigaction(int sig, 


#define cond_syscall(x)  asm(".weak\t" #x "\n" #x " = sys_ni_syscall")



#endif /* __KERNEL__ */

#endif /* _ALPHA_UNISTD_H */

include/asm-arm/unistd.h

+5 −5
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
#ifndef __ASM_ARM_UNISTD_H

#define __ASM_ARM_UNISTD_H



#include <linux/linkage.h>



#define __NR_OABI_SYSCALL_BASE	0x900000



#if defined(__thumb__) || defined(__ARM_EABI__)
@@ -378,6 +376,9 @@ 
#undef __NR_ipc

#endif



#ifdef __KERNEL__

#include <linux/linkage.h>



#define __sys2(x) #x

#define __sys1(x) __sys2(x)
@@ -519,7 +520,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 
  __syscall_return(type,__res);						\

}



#ifdef __KERNEL__

#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SYS_GETHOSTNAME
@@ -540,7 +540,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 
#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_SYS_SOCKETCALL

#endif

#endif



#ifdef __KERNEL_SYSCALLS__
@@ -564,7 +563,7 @@ asmlinkage long sys_rt_sigaction(int sig, 
				struct sigaction __user *oact,

				size_t sigsetsize);



#endif

#endif /* __KERNEL_SYSCALLS__ */



/*

 * "Conditional" syscalls
@@ -574,4 +573,5 @@ asmlinkage long sys_rt_sigaction(int sig, 
 */

#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")



#endif /* __KERNEL__ */

#endif /* __ASM_ARM_UNISTD_H */

include/asm-arm26/unistd.h

+5 −5
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#ifndef __ASM_ARM_UNISTD_H

#define __ASM_ARM_UNISTD_H



#include <linux/linkage.h>



#define __NR_SYSCALL_BASE	0x900000



/*
@@ -312,6 +310,9 @@ 
#define __ARM_NR_cacheflush		(__ARM_NR_BASE+2)

#define __ARM_NR_usr26			(__ARM_NR_BASE+3)



#ifdef __KERNEL__

#include <linux/linkage.h>



#define __sys2(x) #x

#define __sys1(x) __sys2(x)
@@ -443,7 +444,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 
  __syscall_return(type,__res);						\

}



#ifdef __KERNEL__

#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_STAT64
@@ -462,7 +462,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 
#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_SYS_RT_SIGACTION

#endif



#ifdef __KERNEL_SYSCALLS__
@@ -486,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig, 
				struct sigaction __user *oact,

				size_t sigsetsize);



#endif

#endif /* __KERNEL_SYSCALLS__ */



/*

 * "Conditional" syscalls
@@ -496,4 +495,5 @@ asmlinkage long sys_rt_sigaction(int sig, 
 */

#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")



#endif /* __KERNEL__ */

#endif /* __ASM_ARM_UNISTD_H */

include/asm-cris/unistd.h

+4 −5
Original line number Diff line number Diff line
@@ -295,11 +295,11 @@ 
#define __NR_request_key	287

#define __NR_keyctl		288



#define NR_syscalls 289

#ifdef __KERNEL__



#define NR_syscalls 289





#ifdef __KERNEL__

#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_STAT
@@ -379,12 +379,10 @@ asmlinkage long sys_rt_sigaction(int sig, 
 * complaints.  We don't want to use -fno-builtin, so just use a

 * different name when in the kernel.

 */

#ifdef __KERNEL__

#define _exit kernel_syscall_exit

#endif

static inline _syscall1(int,_exit,int,exitcode)

static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)

#endif

#endif /* __KERNEL_SYSCALLS__ */





/*
@@ -395,4 +393,5 @@ static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) 
 */

#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")



#endif /* __KERNEL__ */

#endif /* _ASM_CRIS_UNISTD_H_ */

include/asm-frv/unistd.h

+4 −3
Original line number Diff line number Diff line
@@ -317,6 +317,8 @@ 
#define __NR_pselect6		308

#define __NR_ppoll		309



#ifdef __KERNEL__



#define NR_syscalls 310



/*
@@ -477,9 +479,8 @@ static inline pid_t wait(int * wait_stat) 
	return waitpid(-1,wait_stat,0);

}



#endif

#endif /* __KERNEL_SYSCALLS__ */



#ifdef __KERNEL__

#define __ARCH_WANT_IPC_PARSE_VERSION

/* #define __ARCH_WANT_OLD_READDIR */

#define __ARCH_WANT_OLD_STAT
@@ -503,7 +504,6 @@ static inline pid_t wait(int * wait_stat) 
#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_SYS_RT_SIGACTION

#define __ARCH_WANT_SYS_RT_SIGSUSPEND

#endif



/*

 * "Conditional" syscalls
@@ -515,4 +515,5 @@ static inline pid_t wait(int * wait_stat) 
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")

#endif



#endif /* __KERNEL__ */

#endif /* _ASM_UNISTD_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE