diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2010-08-13 10:06:39 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-08-13 10:06:54 +0200 |
| commit | 3a1103703538d164551dc9b5a734a2c8ebcd27ee (patch) | |
| tree | 78cb5db53ac92c2040cceceaca96f9a85a27bfb9 /arch/s390 | |
| parent | 625c94df22fb4247c8ccd54635a8ec77cb60d651 (diff) | |
| download | kernel_samsung_crespo-3a1103703538d164551dc9b5a734a2c8ebcd27ee.zip kernel_samsung_crespo-3a1103703538d164551dc9b5a734a2c8ebcd27ee.tar.gz kernel_samsung_crespo-3a1103703538d164551dc9b5a734a2c8ebcd27ee.tar.bz2 | |
[S390] sys_personality: follow u_long to unsigned int conversion
commit 485d527686850d68a0e9006dd9904f19f122485e "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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/entry.h | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/sys_s390.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 672ce52..1600f50 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S @@ -614,7 +614,7 @@ sys32_sysfs_wrapper: .globl sys32_personality_wrapper sys32_personality_wrapper: - llgfr %r2,%r2 # unsigned long + llgfr %r2,%r2 # unsigned int jg sys_s390_personality # branch to system call .globl sys32_setfsuid16_wrapper diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h index eb15c12..5bb1e6b 100644 --- a/arch/s390/kernel/entry.h +++ b/arch/s390/kernel/entry.h @@ -31,7 +31,7 @@ struct old_sigaction; long sys_mmap2(struct s390_mmap_arg_struct __user *arg); long sys_s390_ipc(uint call, int first, unsigned long second, 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, size_t len, int advice); long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args); diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index 7b6b0f8..4760814 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -131,9 +131,9 @@ SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second, } #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) personality = PER_LINUX32; |