Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3a984a85050e320993f87ba47a22973f32853206
Commit: 3a984a85050e320993f87ba47a22973f32853206
Parent: 6784fd5931a58559673f500a333030ceaadb69bb
Author: Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 8 15:00:46 2008 -0800
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 15:33:32 2008 -0800
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 <[EMAIL PROTECTED]>
Cc: Christian Zankel <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
include/asm-xtensa/unistd.h | 4 ++--
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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
