aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-09-06 12:52:31 -0400
committerHeiko Carstens <heiko.carstens@de.ibm.com>2013-09-07 05:57:59 -0400
commit5b512beb0f18024e32e228976e3690d349b05b6a (patch)
tree0c4dd52b3ac1523879d1026b259d155b1dd96743
parent984e2a5975e538a6475f7453523896319a1cb597 (diff)
s390/compat signal: add couple of __force annotations
Add __force annotations to get rid of a couple of sparse warnings: arch/s390/kernel/compat_signal.c:335:35: warning: cast removes address space of expression Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-rw-r--r--arch/s390/kernel/compat_signal.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index c439ac9ced09..1389b637dae5 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -332,9 +332,9 @@ static int setup_frame32(int sig, struct k_sigaction *ka,
332 /* Set up to return from userspace. If provided, use a stub 332 /* Set up to return from userspace. If provided, use a stub
333 already in userspace. */ 333 already in userspace. */
334 if (ka->sa.sa_flags & SA_RESTORER) { 334 if (ka->sa.sa_flags & SA_RESTORER) {
335 regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE; 335 regs->gprs[14] = (__u64 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
336 } else { 336 } else {
337 regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE; 337 regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;
338 if (__put_user(S390_SYSCALL_OPCODE | __NR_sigreturn, 338 if (__put_user(S390_SYSCALL_OPCODE | __NR_sigreturn,
339 (u16 __force __user *)(frame->retcode))) 339 (u16 __force __user *)(frame->retcode)))
340 goto give_sigsegv; 340 goto give_sigsegv;
@@ -400,9 +400,9 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
400 /* Set up to return from userspace. If provided, use a stub 400 /* Set up to return from userspace. If provided, use a stub
401 already in userspace. */ 401 already in userspace. */
402 if (ka->sa.sa_flags & SA_RESTORER) { 402 if (ka->sa.sa_flags & SA_RESTORER) {
403 regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE; 403 regs->gprs[14] = (__u64 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
404 } else { 404 } else {
405 regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE; 405 regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;
406 err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn, 406 err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,
407 (u16 __force __user *)(frame->retcode)); 407 (u16 __force __user *)(frame->retcode));
408 } 408 }
@@ -417,7 +417,7 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
417 regs->psw.mask = PSW_MASK_BA | 417 regs->psw.mask = PSW_MASK_BA |
418 (psw_user_bits & PSW_MASK_ASC) | 418 (psw_user_bits & PSW_MASK_ASC) |
419 (regs->psw.mask & ~PSW_MASK_ASC); 419 (regs->psw.mask & ~PSW_MASK_ASC);
420 regs->psw.addr = (__u64) ka->sa.sa_handler; 420 regs->psw.addr = (__u64 __force) ka->sa.sa_handler;
421 421
422 regs->gprs[2] = map_signal(sig); 422 regs->gprs[2] = map_signal(sig);
423 regs->gprs[3] = (__force __u64) &frame->info; 423 regs->gprs[3] = (__force __u64) &frame->info;