diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-29 02:51:47 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-29 02:51:47 +0200 |
| commit | 56142536868a2be34f261ed8fdca1610f8a73fbd (patch) | |
| tree | 0bd66166b318d8403b1881285f6813ece2acced1 /include/asm-m68k/unistd.h | |
| parent | Remove 'extern int errno;' from public view in linux/unistd.h (diff) | |
| download | linux-56142536868a2be34f261ed8fdca1610f8a73fbd.tar.xz linux-56142536868a2be34f261ed8fdca1610f8a73fbd.zip | |
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: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-m68k/unistd.h')
| -rw-r--r-- | include/asm-m68k/unistd.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h index c2554bcd1747..f236fe92156f 100644 --- a/include/asm-m68k/unistd.h +++ b/include/asm-m68k/unistd.h @@ -285,6 +285,8 @@ #define __NR_request_key 280 #define __NR_keyctl 281 +#ifdef __KERNEL__ + #define NR_syscalls 282 /* user-visible error numbers are in the range -1 - -124: see @@ -383,7 +385,6 @@ __asm__ __volatile__ ("trap #0" \ __syscall_return(type,__res); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT @@ -406,7 +407,6 @@ __syscall_return(type,__res); \ #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -451,7 +451,7 @@ asmlinkage long sys_rt_sigaction(int sig, struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -461,4 +461,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_M68K_UNISTD_H_ */ |