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

Commit 78d156b8 authored by Richard Weinberger's avatar Richard Weinberger
Browse files

mn10300: Remove signal translation and exec_domain 



As execution domain support is gone we can remove
signal translation from the signal code and remove
exec_domain from thread_info.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 6140de5a

arch/mn10300/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ typedef struct { 


struct thread_info {

	struct task_struct	*task;		/* main task structure */

	struct exec_domain	*exec_domain;	/* execution domain */

	struct pt_regs		*frame;		/* current exception frame */

	unsigned long		flags;		/* low level flags */

	__u32			cpu;		/* current CPU */
@@ -74,7 +73,6 @@ struct thread_info { 
#define INIT_THREAD_INFO(tsk)			\

{						\

	.task		= &tsk,			\

	.exec_domain	= &default_exec_domain,	\

	.flags		= 0,			\

	.cpu		= 0,			\

	.preempt_count	= INIT_PREEMPT_COUNT,	\

arch/mn10300/kernel/asm-offsets.c

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ void foo(void) 
	BLANK();



	OFFSET(TI_task,			thread_info, task);

	OFFSET(TI_exec_domain,		thread_info, exec_domain);

	OFFSET(TI_frame,		thread_info, frame);

	OFFSET(TI_flags,		thread_info, flags);

	OFFSET(TI_cpu,			thread_info, cpu);
@@ -85,7 +84,6 @@ void foo(void) 
	DEFINE(SIGCHLD_asm,		SIGCHLD);

	BLANK();



	OFFSET(EXEC_DOMAIN_handler,	exec_domain, handler);

	OFFSET(RT_SIGFRAME_sigcontext,	rt_sigframe, uc.uc_mcontext);



	DEFINE(PAGE_SIZE_asm,		PAGE_SIZE);

arch/mn10300/kernel/signal.c

+4 −16
Original line number Diff line number Diff line
@@ -202,20 +202,14 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set, 
		       struct pt_regs *regs)

{

	struct sigframe __user *frame;

	int rsig, sig = ksig->sig;

	int sig = ksig->sig;



	frame = get_sigframe(ksig, regs, sizeof(*frame));



	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))

		return -EFAULT;



	rsig = sig;

	if (sig < 32 &&

	    current_thread_info()->exec_domain &&

	    current_thread_info()->exec_domain->signal_invmap)

		rsig = current_thread_info()->exec_domain->signal_invmap[sig];



	if (__put_user(rsig, &frame->sig) < 0 ||

	if (__put_user(sig, &frame->sig) < 0 ||

	    __put_user(&frame->sc, &frame->psc) < 0)

		return -EFAULT;
@@ -270,20 +264,14 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, 
			  struct pt_regs *regs)

{

	struct rt_sigframe __user *frame;

	int rsig, sig = ksig->sig;

	int sig = ksig->sig;



	frame = get_sigframe(ksig, regs, sizeof(*frame));



	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))

		return -EFAULT;



	rsig = sig;

	if (sig < 32 &&

	    current_thread_info()->exec_domain &&

	    current_thread_info()->exec_domain->signal_invmap)

		rsig = current_thread_info()->exec_domain->signal_invmap[sig];



	if (__put_user(rsig, &frame->sig) ||

	if (__put_user(sig, &frame->sig) ||

	    __put_user(&frame->info, &frame->pinfo) ||

	    __put_user(&frame->uc, &frame->puc) ||

	    copy_siginfo_to_user(&frame->info, &ksig->info))