diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2005-10-21 16:01:34 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-21 22:47:52 +1000 |
| commit | 05d84681abcb33fe34accb5982c413daeb4208c4 (patch) | |
| tree | 713c1ac65109ab1e2b0bd30a29bad13f2caee38e /arch/powerpc/kernel/syscalls.c | |
| parent | 90eac727c6d7afbe707ce408edf97c33385fa08c (diff) | |
| download | talos-op-linux-05d84681abcb33fe34accb5982c413daeb4208c4.tar.gz talos-op-linux-05d84681abcb33fe34accb5982c413daeb4208c4.zip | |
[PATCH] powerpc: Fix mmap returning 64 bit addresses
The merge of syscalls.c & sys_ppc32.c (30286ef6e044bc3d9019c3d8b900572e3fa05e65)
broke mmap, if the mmap returned a 64 bit address.
do_mmap2 was taking the return value from do_mmap_pgoff (an unsigned long), and
storing it in an int, before returning it to sys_mmap as an unsigned long. So
we were losing the high bits of the address.
You would have thought the compiler could catch this for us ...
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/syscalls.c')
| -rw-r--r-- | arch/powerpc/kernel/syscalls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index 7a23721365a6..f72ced11212d 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c @@ -162,7 +162,7 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len, unsigned long fd, unsigned long off, int shift) { struct file * file = NULL; - int ret = -EINVAL; + unsigned long ret = -EINVAL; if (shift) { if (off & ((1 << shift) - 1)) |
