Commit 05d84681 authored Oct 21, 2005 by Michael Ellerman Committed by Paul Mackerras Oct 21, 2005

[PATCH] powerpc: Fix mmap returning 64 bit addresses



The merge of syscalls.c & sys_ppc32.c (30286ef6)
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>

parent 90eac727

arch/powerpc/kernel/syscalls.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))