diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
commit | 3b38f317e529d8396377dafc7d95a1451a151df5 (patch) | |
tree | 65e80799417c456bdd907b7d80182732be02e5f4 /arch/sparc/kernel/systbls.S | |
parent | [PATCH] unused exports in wireless drivers (diff) | |
parent | [SPARC]: Add robust futex syscall entries. (diff) | |
download | linux-dev-3b38f317e529d8396377dafc7d95a1451a151df5.tar.xz linux-dev-3b38f317e529d8396377dafc7d95a1451a151df5.zip |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/sparc/kernel/systbls.S')
-rw-r--r-- | arch/sparc/kernel/systbls.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S index 6e1135cc03b0..2856551bddf1 100644 --- a/arch/sparc/kernel/systbls.S +++ b/arch/sparc/kernel/systbls.S @@ -79,6 +79,7 @@ sys_call_table: /*285*/ .long sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_fstatat64 /*290*/ .long sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat /*295*/ .long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare +/*300*/ .long sys_set_robust_list, sys_get_robust_list #ifdef CONFIG_SUNOS_EMUL /* Now the SunOS syscall table. */ @@ -190,6 +191,6 @@ sunos_sys_table: /*290*/ .long sunos_nosys, sunos_nosys, sunos_nosys .long sunos_nosys, sunos_nosys, sunos_nosys .long sunos_nosys, sunos_nosys, sunos_nosys - .long sunos_nosys + .long sunos_nosys, sunos_nosys, sunos_nosys #endif |