Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common

[firefly-linux-kernel-4.4.55.git] / arch / sparc / kernel / sys_sparc_64.c

diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index c48d93b60afe87e2cae19db19a53adefed8a2929..b489e9759518182b6a3884935e5a1c22b1af3524 100644 (file)
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -413,7 +413,7 @@ out:
 
 SYSCALL_DEFINE1(sparc64_personality, unsigned long, personality)
 {
-       int ret;
+       long ret;
 
        if (personality(current->personality) == PER_LINUX32 &&
            personality(personality) == PER_LINUX)