diff options
-rw-r--r-- | arch/sparc/kernel/systbls.S | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/systbls.S | 3 | ||||
-rw-r--r-- | include/asm-sparc/unistd.h | 3 | ||||
-rw-r--r-- | include/asm-sparc64/unistd.h | 3 |
5 files changed, 10 insertions, 3 deletions
diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S index 3a69778c8366..e3f5b8ed4c52 100644 --- a/arch/sparc/kernel/systbls.S +++ b/arch/sparc/kernel/systbls.S | |||
@@ -80,6 +80,7 @@ sys_call_table: | |||
80 | /*295*/ .long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare | 80 | /*295*/ .long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare |
81 | /*300*/ .long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy | 81 | /*300*/ .long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy |
82 | /*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait | 82 | /*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait |
83 | /*310*/ .long sys_utimensat | ||
83 | 84 | ||
84 | #ifdef CONFIG_SUNOS_EMUL | 85 | #ifdef CONFIG_SUNOS_EMUL |
85 | /* Now the SunOS syscall table. */ | 86 | /* Now the SunOS syscall table. */ |
@@ -196,5 +197,6 @@ sunos_sys_table: | |||
196 | .long sunos_nosys, sunos_nosys, sunos_nosys | 197 | .long sunos_nosys, sunos_nosys, sunos_nosys |
197 | .long sunos_nosys, sunos_nosys, sunos_nosys | 198 | .long sunos_nosys, sunos_nosys, sunos_nosys |
198 | .long sunos_nosys | 199 | .long sunos_nosys |
200 | /*310*/ .long sunos_nosys | ||
199 | 201 | ||
200 | #endif | 202 | #endif |
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index 692e46a6b8da..abd83129b2e7 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c | |||
@@ -793,7 +793,7 @@ asmlinkage long sys32_utimes(char __user *filename, | |||
793 | tv[1].tv_nsec = 1000 * ktvs[1].tv_usec; | 793 | tv[1].tv_nsec = 1000 * ktvs[1].tv_usec; |
794 | } | 794 | } |
795 | 795 | ||
796 | return do_utimes(AT_FDCWD, filename, tvs ? tv : NULL); | 796 | return do_utimes(AT_FDCWD, filename, tvs ? tv : NULL, 0); |
797 | } | 797 | } |
798 | 798 | ||
799 | /* These are here just in case some old sparc32 binary calls it. */ | 799 | /* These are here just in case some old sparc32 binary calls it. */ |
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S index 48c36fe6dc62..5fe7f9ad4a92 100644 --- a/arch/sparc64/kernel/systbls.S +++ b/arch/sparc64/kernel/systbls.S | |||
@@ -81,6 +81,7 @@ sys_call_table32: | |||
81 | .word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare | 81 | .word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare |
82 | /*300*/ .word compat_sys_set_robust_list, compat_sys_get_robust_list, compat_sys_migrate_pages, compat_sys_mbind, compat_sys_get_mempolicy | 82 | /*300*/ .word compat_sys_set_robust_list, compat_sys_get_robust_list, compat_sys_migrate_pages, compat_sys_mbind, compat_sys_get_mempolicy |
83 | .word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait | 83 | .word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait |
84 | /*310*/ .word compat_sys_utimensat | ||
84 | 85 | ||
85 | #endif /* CONFIG_COMPAT */ | 86 | #endif /* CONFIG_COMPAT */ |
86 | 87 | ||
@@ -152,6 +153,7 @@ sys_call_table: | |||
152 | .word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare | 153 | .word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare |
153 | /*300*/ .word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy | 154 | /*300*/ .word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy |
154 | .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait | 155 | .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait |
156 | /*310*/ .word sys_utimensat | ||
155 | 157 | ||
156 | #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \ | 158 | #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \ |
157 | defined(CONFIG_SOLARIS_EMUL_MODULE) | 159 | defined(CONFIG_SOLARIS_EMUL_MODULE) |
@@ -269,5 +271,6 @@ sunos_sys_table: | |||
269 | .word sunos_nosys, sunos_nosys, sunos_nosys | 271 | .word sunos_nosys, sunos_nosys, sunos_nosys |
270 | .word sunos_nosys, sunos_nosys, sunos_nosys | 272 | .word sunos_nosys, sunos_nosys, sunos_nosys |
271 | .word sunos_nosys | 273 | .word sunos_nosys |
274 | /*310*/ .long sunos_nosys | ||
272 | 275 | ||
273 | #endif | 276 | #endif |
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index e43ed1d63a9d..da9bdc5e5526 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
@@ -326,8 +326,9 @@ | |||
326 | #define __NR_move_pages 307 | 326 | #define __NR_move_pages 307 |
327 | #define __NR_getcpu 308 | 327 | #define __NR_getcpu 308 |
328 | #define __NR_epoll_pwait 309 | 328 | #define __NR_epoll_pwait 309 |
329 | #define __NR_utimensat 310 | ||
329 | 330 | ||
330 | #define NR_SYSCALLS 310 | 331 | #define NR_SYSCALLS 311 |
331 | 332 | ||
332 | #ifdef __KERNEL__ | 333 | #ifdef __KERNEL__ |
333 | #define __ARCH_WANT_IPC_PARSE_VERSION | 334 | #define __ARCH_WANT_IPC_PARSE_VERSION |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index e2dcb87e0c62..fcd627594f4c 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
@@ -328,8 +328,9 @@ | |||
328 | #define __NR_move_pages 307 | 328 | #define __NR_move_pages 307 |
329 | #define __NR_getcpu 308 | 329 | #define __NR_getcpu 308 |
330 | #define __NR_epoll_pwait 309 | 330 | #define __NR_epoll_pwait 309 |
331 | #define __NR_utimensat 310 | ||
331 | 332 | ||
332 | #define NR_SYSCALLS 310 | 333 | #define NR_SYSCALLS 311 |
333 | 334 | ||
334 | #ifdef __KERNEL__ | 335 | #ifdef __KERNEL__ |
335 | /* sysconf options, for SunOS compatibility */ | 336 | /* sysconf options, for SunOS compatibility */ |