[PATCH] powerpc: Fix mmap returning 64 bit addresses
authorMichael Ellerman <michael@ellerman.id.au>
Fri, 21 Oct 2005 06:01:34 +0000 (16:01 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 21 Oct 2005 12:47:52 +0000 (22:47 +1000)
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>
arch/powerpc/kernel/syscalls.c

index 7a23721..f72ced1 100644 (file)
@@ -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))