diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-08-01 04:34:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-08-01 04:34:20 -0700 |
| commit | 9e09ffcd8fd912c286f69f22fbf3dc20fdc72f43 (patch) | |
| tree | 7d5182dafa86cdadc9193793b94587a76bfcbe0c | |
| parent | e372e71219f7fef329fdd27b43ae01642368f7e5 (diff) | |
SPARC64: Fixup build errors from pread64/pwrite64 rename.
| -rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 8 | ||||
| -rw-r--r-- | arch/sparc64/solaris/fs.c | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index c16ca0548750..ddf0392850c9 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c @@ -3886,14 +3886,14 @@ extern asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char * buf, typedef __kernel_ssize_t32 ssize_t32; -asmlinkage ssize_t32 sys32_pread(unsigned int fd, char *ubuf, - __kernel_size_t32 count, u32 poshi, u32 poslo) +asmlinkage ssize_t32 sys32_pread64(unsigned int fd, char *ubuf, + __kernel_size_t32 count, u32 poshi, u32 poslo) { return sys_pread64(fd, ubuf, count, ((loff_t)AA(poshi) << 32) | AA(poslo)); } -asmlinkage ssize_t32 sys32_pwrite(unsigned int fd, char *ubuf, - __kernel_size_t32 count, u32 poshi, u32 poslo) +asmlinkage ssize_t32 sys32_pwrite64(unsigned int fd, char *ubuf, + __kernel_size_t32 count, u32 poshi, u32 poslo) { return sys_pwrite64(fd, ubuf, count, ((loff_t)AA(poshi) << 32) | AA(poslo)); } diff --git a/arch/sparc64/solaris/fs.c b/arch/sparc64/solaris/fs.c index 99a223af773b..32ff182cc050 100644 --- a/arch/sparc64/solaris/fs.c +++ b/arch/sparc64/solaris/fs.c @@ -669,18 +669,18 @@ asmlinkage int solaris_facl(unsigned int fd, int cmd, int nentries, u32 aclbufp) asmlinkage int solaris_pread(unsigned int fd, char *buf, u32 count, u32 pos) { - ssize_t (*sys_pread)(unsigned int, char *, size_t, loff_t) = - (ssize_t (*)(unsigned int, char *, size_t, loff_t))SYS(pread); - - return sys_pread(fd, buf, count, (loff_t)pos); + ssize_t (*sys_pread64)(unsigned int, char *, size_t, loff_t) = + (ssize_t (*)(unsigned int, char *, size_t, loff_t))SYS(pread64); + + return sys_pread64(fd, buf, count, (loff_t)pos); } asmlinkage int solaris_pwrite(unsigned int fd, char *buf, u32 count, u32 pos) { - ssize_t (*sys_pwrite)(unsigned int, char *, size_t, loff_t) = - (ssize_t (*)(unsigned int, char *, size_t, loff_t))SYS(pwrite); - - return sys_pwrite(fd, buf, count, (loff_t)pos); + ssize_t (*sys_pwrite64)(unsigned int, char *, size_t, loff_t) = + (ssize_t (*)(unsigned int, char *, size_t, loff_t))SYS(pwrite64); + + return sys_pwrite64(fd, buf, count, (loff_t)pos); } /* POSIX.1 names */ |