summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2006-11-06 14:02:44 +0100
committerHaavard Skinnemoen <hskinnemoen@atmel.com>2006-11-06 14:07:15 +0100
commitbbfd2bf9028a55cb85ff51eb34dc663b7e49ed55 (patch)
treef4af985bc825dbcf8cd586833d5e8b2708a90c1a
parentAVR32: Fix thinko in generic_find_next_zero_le_bit() (diff)
downloadlinux-bbfd2bf9028a55cb85ff51eb34dc663b7e49ed55.tar.xz
linux-bbfd2bf9028a55cb85ff51eb34dc663b7e49ed55.zip
AVR32: Wire up sys_epoll_pwait
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
-rw-r--r--arch/avr32/kernel/syscall-stubs.S9
-rw-r--r--arch/avr32/kernel/syscall_table.S1
-rw-r--r--include/asm-avr32/unistd.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/arch/avr32/kernel/syscall-stubs.S b/arch/avr32/kernel/syscall-stubs.S
index 7589a9b426cb..890286a1e62b 100644
--- a/arch/avr32/kernel/syscall-stubs.S
+++ b/arch/avr32/kernel/syscall-stubs.S
@@ -100,3 +100,12 @@ __sys_splice:
rcall sys_splice
sub sp, -4
popm pc
+
+ .global __sys_epoll_pwait
+ .type __sys_epoll_pwait,@function
+__sys_epoll_pwait:
+ pushm lr
+ st.w --sp, ARG6
+ rcall sys_epoll_pwait
+ sub sp, -4
+ popm pc
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index 63b206965d05..db8f8b55ffdf 100644
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -286,4 +286,5 @@ sys_call_table:
.long sys_sync_file_range
.long sys_tee
.long sys_vmsplice
+ .long __sys_epoll_pwait /* 265 */
.long sys_ni_syscall /* r8 is saturated at nr_syscalls */
diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h
index a50e5004550c..56ed1f9d348a 100644
--- a/include/asm-avr32/unistd.h
+++ b/include/asm-avr32/unistd.h
@@ -280,9 +280,10 @@
#define __NR_sync_file_range 262
#define __NR_tee 263
#define __NR_vmsplice 264
+#define __NR_epoll_pwait 265
#ifdef __KERNEL__
-#define NR_syscalls 265
+#define NR_syscalls 266
#define __ARCH_WANT_IPC_PARSE_VERSION