Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b512beb authored by Heiko Carstens's avatar Heiko Carstens
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 984e2a59

arch/s390/kernel/compat_signal.c

+5 −5
Original line number Diff line number Diff line
@@ -332,9 +332,9 @@ static int setup_frame32(int sig, struct k_sigaction *ka, 
	/* Set up to return from userspace.  If provided, use a stub

	   already in userspace.  */

	if (ka->sa.sa_flags & SA_RESTORER) {

		regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE;

		regs->gprs[14] = (__u64 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;

	} else {

		regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE;

		regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;

		if (__put_user(S390_SYSCALL_OPCODE | __NR_sigreturn,

			       (u16 __force __user *)(frame->retcode)))

			goto give_sigsegv;
@@ -400,9 +400,9 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, 
	/* Set up to return from userspace.  If provided, use a stub

	   already in userspace.  */

	if (ka->sa.sa_flags & SA_RESTORER) {

		regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE;

		regs->gprs[14] = (__u64 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;

	} else {

		regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE;

		regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;

		err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,

				  (u16 __force __user *)(frame->retcode));

	}
@@ -417,7 +417,7 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, 
	regs->psw.mask = PSW_MASK_BA |

		(psw_user_bits & PSW_MASK_ASC) |

		(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (__u64) ka->sa.sa_handler;

	regs->psw.addr = (__u64 __force) ka->sa.sa_handler;



	regs->gprs[2] = map_signal(sig);

	regs->gprs[3] = (__force __u64) &frame->info;