diff --git a/[refs] b/[refs]
index 40071da913d5..25577daf2ed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90eac727c6d7afbe707ce408edf97c33385fa08c
+refs/heads/master: 05d84681abcb33fe34accb5982c413daeb4208c4
diff --git a/trunk/arch/powerpc/kernel/syscalls.c b/trunk/arch/powerpc/kernel/syscalls.c
index 7a23721365a6..f72ced11212d 100644
--- a/trunk/arch/powerpc/kernel/syscalls.c
+++ b/trunk/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))