Commit 3a110370 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

[S390] sys_personality: follow u_long to unsigned int conversion

commit 485d5276 "sys_personality: change
sys_personality() to accept "unsigned int" instead of u_long" changed
the syscall interface for sys_personality.
Just follow the common code change in our arch code to avoid confusion.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 625c94df
...@@ -614,7 +614,7 @@ sys32_sysfs_wrapper: ...@@ -614,7 +614,7 @@ sys32_sysfs_wrapper:
.globl sys32_personality_wrapper .globl sys32_personality_wrapper
sys32_personality_wrapper: sys32_personality_wrapper:
llgfr %r2,%r2 # unsigned long llgfr %r2,%r2 # unsigned int
jg sys_s390_personality # branch to system call jg sys_s390_personality # branch to system call
.globl sys32_setfsuid16_wrapper .globl sys32_setfsuid16_wrapper
......
...@@ -31,7 +31,7 @@ struct old_sigaction; ...@@ -31,7 +31,7 @@ struct old_sigaction;
long sys_mmap2(struct s390_mmap_arg_struct __user *arg); long sys_mmap2(struct s390_mmap_arg_struct __user *arg);
long sys_s390_ipc(uint call, int first, unsigned long second, long sys_s390_ipc(uint call, int first, unsigned long second,
unsigned long third, void __user *ptr); unsigned long third, void __user *ptr);
long sys_s390_personality(unsigned long personality); long sys_s390_personality(unsigned int personality);
long sys_s390_fadvise64(int fd, u32 offset_high, u32 offset_low, long sys_s390_fadvise64(int fd, u32 offset_high, u32 offset_low,
size_t len, int advice); size_t len, int advice);
long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args); long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);
......
...@@ -131,9 +131,9 @@ SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second, ...@@ -131,9 +131,9 @@ SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second,
} }
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
SYSCALL_DEFINE1(s390_personality, unsigned long, personality) SYSCALL_DEFINE1(s390_personality, unsigned int, personality)
{ {
int ret; unsigned int ret;
if (current->personality == PER_LINUX32 && personality == PER_LINUX) if (current->personality == PER_LINUX32 && personality == PER_LINUX)
personality = PER_LINUX32; personality = PER_LINUX32;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment