diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:26:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:26:54 -0400 |
commit | 5ac12c6fe1b5fbda0d0caedb8214cde545a5737c (patch) | |
tree | 26c7ad8f48ee82d4253a4a8c0637180aa0fb8b0d /arch/sparc64/kernel/sys_sparc32.c | |
parent | 52a23685f37c06d0cd00eeb8f517a90de3f2c338 (diff) | |
parent | 78d00125398f18f7354e759ba7cd544a6b07f504 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix two year old bug in early bootup asm.
[SPARC64]: Update defconfig.
[SPARC64]: Fix log message type in vio_create_one().
[SPARC64]: Tweak assertions in sun4v_build_virq().
[SPARC64]: Tweak kernel log messages in power_probe().
[SPARC64]: Fix handling of multiple vdc-port nodes.
[SPARC64]: Fix device type matching in VIO's devspec_show().
[SPARC64]: Fix MODULE_DEVICE_TABLE() specification in VDC and VNET.
[SPARC]: Add sys_fallocate() entries.
[SPARC64]: Use orderly_poweroff().
Diffstat (limited to 'arch/sparc64/kernel/sys_sparc32.c')
-rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 12 |
1 files changed, 9 insertions, 3 deletions
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 | } | ||