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

Commit 9e4d11f8 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] frv: signal annotations 



Add annotations to the FRV signal handling for sparse.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3f4cd389

arch/frv/kernel/signal.c

+10 −10
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss) 


struct sigframe

{

	void (*pretcode)(void);

	__sigrestore_t pretcode;

	int sig;

	struct sigcontext sc;

	unsigned long extramask[_NSIG_WORDS-1];
@@ -107,10 +107,10 @@ struct sigframe 


struct rt_sigframe

{

	void (*pretcode)(void);

	__sigrestore_t pretcode;

	int sig;

	struct siginfo *pinfo;

	void *puc;

	struct siginfo __user *pinfo;

	void __user *puc;

	struct siginfo info;

	struct ucontext uc;

	uint32_t retcode[2];
@@ -284,7 +284,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set) 
		 *	setlos	#__NR_sigreturn,gr7

		 *	tira	gr0,0

		 */

		if (__put_user((void (*)(void))frame->retcode, &frame->pretcode) ||

		if (__put_user((__sigrestore_t)frame->retcode, &frame->pretcode) ||

		    __put_user(0x8efc0000|__NR_sigreturn, &frame->retcode[0]) ||

		    __put_user(0xc0700000, &frame->retcode[1]))

			goto give_sigsegv;
@@ -300,7 +300,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set) 


	if (get_personality & FDPIC_FUNCPTRS) {

		struct fdpic_func_descriptor __user *funcptr =

			(struct fdpic_func_descriptor *) ka->sa.sa_handler;

			(struct fdpic_func_descriptor __user *) ka->sa.sa_handler;

		__get_user(__frame->pc, &funcptr->text);

		__get_user(__frame->gr15, &funcptr->GOT);

	} else {
@@ -359,8 +359,8 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 


	/* Create the ucontext.  */

	if (__put_user(0, &frame->uc.uc_flags) ||

	    __put_user(0, &frame->uc.uc_link) ||

	    __put_user((void*)current->sas_ss_sp, &frame->uc.uc_stack.ss_sp) ||

	    __put_user(NULL, &frame->uc.uc_link) ||

	    __put_user((void __user *)current->sas_ss_sp, &frame->uc.uc_stack.ss_sp) ||

	    __put_user(sas_ss_flags(__frame->sp), &frame->uc.uc_stack.ss_flags) ||

	    __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size))

		goto give_sigsegv;
@@ -382,7 +382,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
		 *	setlos	#__NR_sigreturn,gr7

		 *	tira	gr0,0

		 */

		if (__put_user((void (*)(void))frame->retcode, &frame->pretcode) ||

		if (__put_user((__sigrestore_t)frame->retcode, &frame->pretcode) ||

		    __put_user(0x8efc0000|__NR_rt_sigreturn, &frame->retcode[0]) ||

		    __put_user(0xc0700000, &frame->retcode[1]))

			goto give_sigsegv;
@@ -398,7 +398,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	__frame->gr9 = (unsigned long) &frame->info;



	if (get_personality & FDPIC_FUNCPTRS) {

		struct fdpic_func_descriptor *funcptr =

		struct fdpic_func_descriptor __user *funcptr =

			(struct fdpic_func_descriptor __user *) ka->sa.sa_handler;

		__get_user(__frame->pc, &funcptr->text);

		__get_user(__frame->gr15, &funcptr->GOT);

include/asm-frv/signal.h

+3 −3
Original line number Diff line number Diff line
@@ -114,13 +114,13 @@ struct old_sigaction { 
	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	unsigned long sa_flags;

	void (*sa_restorer)(void);

	__sigrestore_t sa_restorer;

};



struct sigaction {

	__sighandler_t sa_handler;

	unsigned long sa_flags;

	void (*sa_restorer)(void);

	__sigrestore_t sa_restorer;

	sigset_t sa_mask;		/* mask last for extensibility */

};
@@ -146,7 +146,7 @@ struct sigaction { 
#endif /* __KERNEL__ */



typedef struct sigaltstack {

	void *ss_sp;

	void __user *ss_sp;

	int ss_flags;

	size_t ss_size;

} stack_t;