summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 11:54:30 +0100
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 11:54:30 +0100
commit7800029df321b033ef27122fbb599ee0a839eb53 (patch)
treefae2f4b1be9442a99724b5fc8c1b976b1dd34dfd /arch/cris
parentMAINTAINERS: Add my information for the CRIS port. (diff)
downloadlinux-7800029df321b033ef27122fbb599ee0a839eb53.tar.xz
linux-7800029df321b033ef27122fbb599ee0a839eb53.zip
CRIS: Add new timerfd syscall entries.
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/kernel/entry.S4
-rw-r--r--arch/cris/arch-v32/kernel/entry.S4
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S
index b61aedbad38f..3a65f322ae07 100644
--- a/arch/cris/arch-v10/kernel/entry.S
+++ b/arch/cris/arch-v10/kernel/entry.S
@@ -924,9 +924,11 @@ sys_call_table:
.long sys_epoll_pwait
.long sys_utimensat /* 320 */
.long sys_signalfd
- .long sys_ni_syscall
+ .long sys_timerfd_create
.long sys_eventfd
.long sys_fallocate
+ .long sys_timerfd_settime /* 325 */
+ .long sys_timerfd_gettime
/*
* NOTE!! This doesn't have to be exact - we just have
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
index f58e137876f8..eebbaba45430 100644
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -847,9 +847,11 @@ sys_call_table:
.long sys_epoll_pwait
.long sys_utimensat /* 320 */
.long sys_signalfd
- .long sys_timerfd
+ .long sys_timerfd_create
.long sys_eventfd
.long sys_fallocate
+ .long sys_timerfd_settime /* 325 */
+ .long sys_timerfd_gettime
/*
* NOTE!! This doesn't have to be exact - we just have