Commit 8bf6e1bc authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Consolidate duplicate _32/_64 unistd definitions. 



This does some more tidying and converging of the header split, following
the x86 example.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4eb80146

arch/sh/include/asm/unistd.h

+37 −0
Original line number Diff line number Diff line 
#ifdef __KERNEL__

# ifdef CONFIG_SUPERH32



#  include "unistd_32.h"

#  define __ARCH_WANT_SYS_RT_SIGSUSPEND



# else

#  include "unistd_64.h"

# endif



# define __ARCH_WANT_IPC_PARSE_VERSION

# define __ARCH_WANT_OLD_READDIR

# define __ARCH_WANT_OLD_STAT

# define __ARCH_WANT_STAT64

# define __ARCH_WANT_SYS_ALARM

# define __ARCH_WANT_SYS_GETHOSTNAME

# define __ARCH_WANT_SYS_IPC

# define __ARCH_WANT_SYS_PAUSE

# define __ARCH_WANT_SYS_SGETMASK

# define __ARCH_WANT_SYS_SIGNAL

# define __ARCH_WANT_SYS_TIME

# define __ARCH_WANT_SYS_UTIME

# define __ARCH_WANT_SYS_WAITPID

# define __ARCH_WANT_SYS_SOCKETCALL

# define __ARCH_WANT_SYS_FADVISE64

# define __ARCH_WANT_SYS_GETPGRP

# define __ARCH_WANT_SYS_LLSEEK

# define __ARCH_WANT_SYS_NICE

# define __ARCH_WANT_SYS_OLD_GETRLIMIT

# define __ARCH_WANT_SYS_OLD_UNAME

# define __ARCH_WANT_SYS_OLDUMOUNT

# define __ARCH_WANT_SYS_SIGPENDING

# define __ARCH_WANT_SYS_SIGPROCMASK

# define __ARCH_WANT_SYS_RT_SIGACTION



/*

 * "Conditional" syscalls

 *

 * What we want is __attribute__((weak,alias("sys_ni_syscall"))),

 * but it doesn't work on all toolchains, so we just do it by hand

 */

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



#else

# ifdef __SH5__

#  include "unistd_64.h"

arch/sh/include/asm/unistd_32.h

+3 −42
Original line number Diff line number Diff line 
#ifndef __ASM_SH_UNISTD_H

#define __ASM_SH_UNISTD_H

#ifndef __ASM_SH_UNISTD_32_H

#define __ASM_SH_UNISTD_32_H



/*

 * Copyright (C) 1999  Niibe Yutaka
@@ -381,43 +381,4 @@ 


#define NR_syscalls 367



#ifdef __KERNEL__



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_STAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SYS_ALARM

#define __ARCH_WANT_SYS_GETHOSTNAME

#define __ARCH_WANT_SYS_IPC

#define __ARCH_WANT_SYS_PAUSE

#define __ARCH_WANT_SYS_SGETMASK

#define __ARCH_WANT_SYS_SIGNAL

#define __ARCH_WANT_SYS_TIME

#define __ARCH_WANT_SYS_UTIME

#define __ARCH_WANT_SYS_WAITPID

#define __ARCH_WANT_SYS_SOCKETCALL

#define __ARCH_WANT_SYS_FADVISE64

#define __ARCH_WANT_SYS_GETPGRP

#define __ARCH_WANT_SYS_LLSEEK

#define __ARCH_WANT_SYS_NICE

#define __ARCH_WANT_SYS_OLD_GETRLIMIT

#define __ARCH_WANT_SYS_OLD_UNAME

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_SYS_RT_SIGACTION

#define __ARCH_WANT_SYS_RT_SIGSUSPEND



/*

 * "Conditional" syscalls

 *

 * What we want is __attribute__((weak,alias("sys_ni_syscall"))),

 * but it doesn't work on all toolchains, so we just do it by hand

 */

#ifndef cond_syscall

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

#endif



#endif /* __KERNEL__ */

#endif /* __ASM_SH_UNISTD_H */
 
#endif /* __ASM_SH_UNISTD_32_H */

arch/sh/include/asm/unistd_64.h

+0 −38
Original line number Diff line number Diff line
@@ -399,44 +399,6 @@ 
#define __NR_process_vm_readv	376

#define __NR_process_vm_writev	377



#ifdef __KERNEL__



#define NR_syscalls 378



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_STAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SYS_ALARM

#define __ARCH_WANT_SYS_GETHOSTNAME

#define __ARCH_WANT_SYS_IPC

#define __ARCH_WANT_SYS_PAUSE

#define __ARCH_WANT_SYS_SGETMASK

#define __ARCH_WANT_SYS_SIGNAL

#define __ARCH_WANT_SYS_TIME

#define __ARCH_WANT_SYS_UTIME

#define __ARCH_WANT_SYS_WAITPID

#define __ARCH_WANT_SYS_SOCKETCALL

#define __ARCH_WANT_SYS_FADVISE64

#define __ARCH_WANT_SYS_GETPGRP

#define __ARCH_WANT_SYS_LLSEEK

#define __ARCH_WANT_SYS_NICE

#define __ARCH_WANT_SYS_OLD_GETRLIMIT

#define __ARCH_WANT_SYS_OLD_UNAME

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_SYS_RT_SIGACTION



/*

 * "Conditional" syscalls

 *

 * What we want is __attribute__((weak,alias("sys_ni_syscall"))),

 * but it doesn't work on all toolchains, so we just do it by hand

 */

#ifndef cond_syscall

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

#endif



#endif /* __KERNEL__ */

#endif /* __ASM_SH_UNISTD_64_H */