summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-02-08 15:00:46 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 15:33:32 -0800
commit3a984a85050e320993f87ba47a22973f32853206 (patch)
tree6627262885737a4a078a4dcd1eb11ca95a56ddbc
parent6784fd5931a58559673f500a333030ceaadb69bb (diff)
downloadop-kernel-dev-3a984a85050e320993f87ba47a22973f32853206.zip
op-kernel-dev-3a984a85050e320993f87ba47a22973f32853206.tar.gz
fix xtensa timerfd breakage
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/xtensa/kernel/syscall.c:39: include2/asm/unistd.h:681: error: 'sys_timerfd' undeclared here (not in a function) Signed-off-by: Adrian Bunk <bunk@kernel.org> Cc: Christian Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-xtensa/unistd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-xtensa/unistd.h b/include/asm-xtensa/unistd.h
index 92968aa..c092c8f 100644
--- a/include/asm-xtensa/unistd.h
+++ b/include/asm-xtensa/unistd.h
@@ -677,8 +677,8 @@ __SYSCALL(303, sys_ni_syscall, 0)
#define __NR_signalfd 304
__SYSCALL(304, sys_signalfd, 3)
-#define __NR_timerfd 305
-__SYSCALL(305, sys_timerfd, 4)
+/* 305 was __NR_timerfd */
+__SYSCALL(305, sys_ni_syscall, 0)
#define __NR_eventfd 306
__SYSCALL(306, sys_eventfd, 1)
OpenPOWER on IntegriCloud