diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:56 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:56 +0800 |
commit | 0f7fc48d4378ac087ef7e69a6e675b0d9280999e (patch) | |
tree | f0c005b00166eca0ce2648487cde89866447645f /arch/sparc/kernel/sys_sparc_64.c | |
parent | 4fc0eccae84a29106ed944588ba641e9039ccfbc (diff) | |
parent | fbb0b56de45bc81681eeeaec29e6c1e3ff12a200 (diff) |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.03-androidlinux-linaro-lsk-v3.10-android
Diffstat (limited to 'arch/sparc/kernel/sys_sparc_64.c')
-rw-r--r-- | arch/sparc/kernel/sys_sparc_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index be8db9bb7878..666510b39870 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -416,7 +416,7 @@ out: SYSCALL_DEFINE1(sparc64_personality, unsigned long, personality) { - int ret; + long ret; if (personality(current->personality) == PER_LINUX32 && personality(personality) == PER_LINUX) |