diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-18 17:28:59 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-20 00:26:47 -0400 |
commit | bc5a2e64a185c4759a540becac34651443b2d2ab (patch) | |
tree | c28edf9737797846291928512fd0459cda6770bf | |
parent | a376178011c9db0b704bb1f9b4719d873847362e (diff) |
[SPARC]: Add sys_fallocate() entries.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/systbls.S | 9 | ||||
-rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 12 | ||||
-rw-r--r-- | arch/sparc64/kernel/systbls.S | 11 | ||||
-rw-r--r-- | include/asm-sparc/unistd.h | 6 | ||||
-rw-r--r-- | include/asm-sparc64/unistd.h | 6 |
5 files changed, 24 insertions, 20 deletions
diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S index 90b52d4dab9a..55722840859c 100644 --- a/arch/sparc/kernel/systbls.S +++ b/arch/sparc/kernel/systbls.S | |||
@@ -1,8 +1,7 @@ | |||
1 | /* $Id: systbls.S,v 1.103 2002/02/08 03:57:14 davem Exp $ | 1 | /* systbls.S: System call entry point tables for OS compatibility. |
2 | * systbls.S: System call entry point tables for OS compatibility. | ||
3 | * The native Linux system call table lives here also. | 2 | * The native Linux system call table lives here also. |
4 | * | 3 | * |
5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net) |
6 | * | 5 | * |
7 | * Based upon preliminary work which is: | 6 | * Based upon preliminary work which is: |
8 | * | 7 | * |
@@ -80,7 +79,7 @@ sys_call_table: | |||
80 | /*295*/ .long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare | 79 | /*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 | 80 | /*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 | 81 | /*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait |
83 | /*310*/ .long sys_utimensat, sys_signalfd, sys_timerfd, sys_eventfd | 82 | /*310*/ .long sys_utimensat, sys_signalfd, sys_timerfd, sys_eventfd, sys_fallocate |
84 | 83 | ||
85 | #ifdef CONFIG_SUNOS_EMUL | 84 | #ifdef CONFIG_SUNOS_EMUL |
86 | /* Now the SunOS syscall table. */ | 85 | /* Now the SunOS syscall table. */ |
@@ -198,6 +197,6 @@ sunos_sys_table: | |||
198 | .long sunos_nosys, sunos_nosys, sunos_nosys | 197 | .long sunos_nosys, sunos_nosys, sunos_nosys |
199 | .long sunos_nosys | 198 | .long sunos_nosys |
200 | /*310*/ .long sunos_nosys, sunos_nosys, sunos_nosys | 199 | /*310*/ .long sunos_nosys, sunos_nosys, sunos_nosys |
201 | .long sunos_nosys | 200 | .long sunos_nosys, sunos_nosys |
202 | 201 | ||
203 | #endif | 202 | #endif |
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index abd83129b2e7..e8dce90d05d4 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c | |||
@@ -1,8 +1,7 @@ | |||
1 | /* $Id: sys_sparc32.c,v 1.184 2002/02/09 19:49:31 davem Exp $ | 1 | /* sys_sparc32.c: Conversion between 32bit and 64bit native syscalls. |
2 | * sys_sparc32.c: Conversion between 32bit and 64bit native syscalls. | ||
3 | * | 2 | * |
4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 3 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
5 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997, 2007 David S. Miller (davem@davemloft.net) |
6 | * | 5 | * |
7 | * These routines maintain argument size conversion between 32bit and 64bit | 6 | * These routines maintain argument size conversion between 32bit and 64bit |
8 | * environment. | 7 | * environment. |
@@ -1028,3 +1027,10 @@ long compat_sync_file_range(int fd, unsigned long off_high, unsigned long off_lo | |||
1028 | (nb_high << 32) | nb_low, | 1027 | (nb_high << 32) | nb_low, |
1029 | flags); | 1028 | flags); |
1030 | } | 1029 | } |
1030 | |||
1031 | asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo, | ||
1032 | u32 lenhi, u32 lenlo) | ||
1033 | { | ||
1034 | return sys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo, | ||
1035 | ((loff_t)lenhi << 32) | lenlo); | ||
1036 | } | ||
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S index 8765e32155a0..06d10907d8ce 100644 --- a/arch/sparc64/kernel/systbls.S +++ b/arch/sparc64/kernel/systbls.S | |||
@@ -1,8 +1,7 @@ | |||
1 | /* $Id: systbls.S,v 1.81 2002/02/08 03:57:14 davem Exp $ | 1 | /* systbls.S: System call entry point tables for OS compatibility. |
2 | * systbls.S: System call entry point tables for OS compatibility. | ||
3 | * The native Linux system call table lives here also. | 2 | * The native Linux system call table lives here also. |
4 | * | 3 | * |
5 | * Copyright (C) 1995, 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995, 1996, 2007 David S. Miller (davem@davemloft.net) |
6 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 5 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
7 | * | 6 | * |
8 | * Based upon preliminary work which is: | 7 | * Based upon preliminary work which is: |
@@ -81,7 +80,7 @@ sys_call_table32: | |||
81 | .word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare | 80 | .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 | 81 | /*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 | 82 | .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, compat_sys_signalfd, compat_sys_timerfd, sys_eventfd | 83 | /*310*/ .word compat_sys_utimensat, compat_sys_signalfd, compat_sys_timerfd, sys_eventfd, compat_sys_fallocate |
85 | 84 | ||
86 | #endif /* CONFIG_COMPAT */ | 85 | #endif /* CONFIG_COMPAT */ |
87 | 86 | ||
@@ -153,7 +152,7 @@ sys_call_table: | |||
153 | .word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare | 152 | .word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare |
154 | /*300*/ .word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy | 153 | /*300*/ .word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy |
155 | .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait | 154 | .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait |
156 | /*310*/ .word sys_utimensat, sys_signalfd, sys_timerfd, sys_eventfd | 155 | /*310*/ .word sys_utimensat, sys_signalfd, sys_timerfd, sys_eventfd, sys_fallocate |
157 | 156 | ||
158 | #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \ | 157 | #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \ |
159 | defined(CONFIG_SOLARIS_EMUL_MODULE) | 158 | defined(CONFIG_SOLARIS_EMUL_MODULE) |
@@ -272,6 +271,6 @@ sunos_sys_table: | |||
272 | .word sunos_nosys, sunos_nosys, sunos_nosys | 271 | .word sunos_nosys, sunos_nosys, sunos_nosys |
273 | .word sunos_nosys | 272 | .word sunos_nosys |
274 | /*310*/ .word sunos_nosys, sunos_nosys, sunos_nosys | 273 | /*310*/ .word sunos_nosys, sunos_nosys, sunos_nosys |
275 | .word sunos_nosys | 274 | .word sunos_nosys, sunos_nosys |
276 | 275 | ||
277 | #endif | 276 | #endif |
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 64471bcd96f9..029b3e0d5e4c 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */ | ||
2 | #ifndef _SPARC_UNISTD_H | 1 | #ifndef _SPARC_UNISTD_H |
3 | #define _SPARC_UNISTD_H | 2 | #define _SPARC_UNISTD_H |
4 | 3 | ||
@@ -9,7 +8,7 @@ | |||
9 | * think of right now to force the arguments into fixed registers | 8 | * think of right now to force the arguments into fixed registers |
10 | * before the trap into the system call with gcc 'asm' statements. | 9 | * before the trap into the system call with gcc 'asm' statements. |
11 | * | 10 | * |
12 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 11 | * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net) |
13 | * | 12 | * |
14 | * SunOS compatibility based upon preliminary work which is: | 13 | * SunOS compatibility based upon preliminary work which is: |
15 | * | 14 | * |
@@ -330,8 +329,9 @@ | |||
330 | #define __NR_signalfd 311 | 329 | #define __NR_signalfd 311 |
331 | #define __NR_timerfd 312 | 330 | #define __NR_timerfd 312 |
332 | #define __NR_eventfd 313 | 331 | #define __NR_eventfd 313 |
332 | #define __NR_fallocate 314 | ||
333 | 333 | ||
334 | #define NR_SYSCALLS 314 | 334 | #define NR_SYSCALLS 315 |
335 | 335 | ||
336 | #ifdef __KERNEL__ | 336 | #ifdef __KERNEL__ |
337 | #define __ARCH_WANT_IPC_PARSE_VERSION | 337 | #define __ARCH_WANT_IPC_PARSE_VERSION |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index 53e96ed9c024..cb751b4d0f56 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: unistd.h,v 1.50 2002/02/08 03:57:18 davem Exp $ */ | ||
2 | #ifndef _SPARC64_UNISTD_H | 1 | #ifndef _SPARC64_UNISTD_H |
3 | #define _SPARC64_UNISTD_H | 2 | #define _SPARC64_UNISTD_H |
4 | 3 | ||
@@ -9,7 +8,7 @@ | |||
9 | * think of right now to force the arguments into fixed registers | 8 | * think of right now to force the arguments into fixed registers |
10 | * before the trap into the system call with gcc 'asm' statements. | 9 | * before the trap into the system call with gcc 'asm' statements. |
11 | * | 10 | * |
12 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 11 | * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net) |
13 | * | 12 | * |
14 | * SunOS compatibility based upon preliminary work which is: | 13 | * SunOS compatibility based upon preliminary work which is: |
15 | * | 14 | * |
@@ -332,8 +331,9 @@ | |||
332 | #define __NR_signalfd 311 | 331 | #define __NR_signalfd 311 |
333 | #define __NR_timerfd 312 | 332 | #define __NR_timerfd 312 |
334 | #define __NR_eventfd 313 | 333 | #define __NR_eventfd 313 |
334 | #define __NR_fallocate 314 | ||
335 | 335 | ||
336 | #define NR_SYSCALLS 314 | 336 | #define NR_SYSCALLS 315 |
337 | 337 | ||
338 | #ifdef __KERNEL__ | 338 | #ifdef __KERNEL__ |
339 | /* sysconf options, for SunOS compatibility */ | 339 | /* sysconf options, for SunOS compatibility */ |