Merge kanga.twiddle.net:/home/rth/work/linux/linus-2.5

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

Merge kanga.twiddle.net:/home/rth/work/linux/linus-2.5
into kanga.twiddle.net:/home/rth/work/linux/axp-2.5
0a1b9a13 · Richard Henderson · f54e16ee · 1c2e76d9 · 0a1b9a13 · 0a1b9a13
Commit 0a1b9a13 authored Jun 07, 2003 by Richard Henderson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

arch/alpha/kernel/systbls.S arch/alpha/kernel/systbls.S +1 -0

include/asm-alpha/unistd.h include/asm-alpha/unistd.h +2 -1

No files found.
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@ -442,6 +442,7 @@ sys_call_table:
 	.quad sys_clock_gettime			/* 420 */
 	.quad sys_clock_getres
 	.quad sys_clock_nanosleep
+	.quad sys_semtimedop

 	.size sys_call_table, . - sys_call_table
 	.type sys_call_table, @object

--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -358,7 +358,8 @@
 #define __NR_clock_gettime		420
 #define __NR_clock_getres		421
 #define __NR_clock_nanosleep		422
-#define NR_SYSCALLS			423
+#define __NR_semtimedop			423
+#define NR_SYSCALLS			424

 #if defined(__GNUC__)