Merge branch 'master'

[karo-tx-linux.git] / arch / powerpc / kernel / syscalls.c

diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index 7a23721365a67af8e4032278c710fefc457e6f7b..f72ced11212d500a70e7569568f61e449fb72b24 100644 (file)
--- 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))