aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-15 19:01:39 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-15 19:01:39 -0400
commit63d39fe88ffabbd82d9db42e9b603c58532fc918 (patch)
treebaa66eed1709d85406bc476cb468204968b5b512 /include
parent2c5362007bc0a46461a9d94958cdd53bb027004c (diff)
parent463b158aab247b600e4e93614b7b8f42a66331c9 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3477/1: ARM EABI: undefine removed syscalls [ARM] 3475/1: S3C2410: fix spelling mistake in SMDK partition table [ARM] 3474/1: S3C2440: USB rate writes wrong var to CLKDIVN
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/unistd.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index 65ac305c2d45..ee8dfea549bc 100644
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -360,6 +360,24 @@
360#define __ARM_NR_usr32 (__ARM_NR_BASE+4) 360#define __ARM_NR_usr32 (__ARM_NR_BASE+4)
361#define __ARM_NR_set_tls (__ARM_NR_BASE+5) 361#define __ARM_NR_set_tls (__ARM_NR_BASE+5)
362 362
363/*
364 * The following syscalls are obsolete and no longer available for EABI.
365 */
366#if defined(__ARM_EABI__)
367#undef __NR_time
368#undef __NR_umount
369#undef __NR_stime
370#undef __NR_alarm
371#undef __NR_utime
372#undef __NR_getrlimit
373#undef __NR_select
374#undef __NR_readdir
375#undef __NR_mmap
376#undef __NR_socketcall
377#undef __NR_syscall
378#undef __NR_ipc
379#endif
380
363#define __sys2(x) #x 381#define __sys2(x) #x
364#define __sys1(x) __sys2(x) 382#define __sys1(x) __sys2(x)
365 383