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

Commit 6a32591a authored by Richard Weinberger's avatar Richard Weinberger
Browse files

s390: 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 78d156b8

arch/s390/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
 */

struct thread_info {

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

	struct exec_domain	*exec_domain;	/* execution domain */

	unsigned long		flags;		/* low level flags */

	unsigned long		sys_call_table;	/* System call table address */

	unsigned int		cpu;		/* current CPU */
@@ -51,7 +50,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/s390/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ int main(void) 
	DEFINE(__THREAD_per_paid, offsetof(struct task_struct, thread.per_event.paid));

	BLANK();

	DEFINE(__TI_task, offsetof(struct thread_info, task));

	DEFINE(__TI_domain, offsetof(struct thread_info, exec_domain));

	DEFINE(__TI_flags, offsetof(struct thread_info, flags));

	DEFINE(__TI_sysc_table, offsetof(struct thread_info, sys_call_table));

	DEFINE(__TI_cpu, offsetof(struct thread_info, cpu));

arch/s390/kernel/compat_signal.c

+2 −12
Original line number Diff line number Diff line
@@ -370,16 +370,6 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size) 
	return (void __user *)((sp - frame_size) & -8ul);

}



static inline int map_signal(int sig)

{

	if (current_thread_info()->exec_domain

	    && current_thread_info()->exec_domain->signal_invmap

	    && sig < 32)

		return current_thread_info()->exec_domain->signal_invmap[sig];

        else

		return sig;

}



static int setup_frame32(struct ksignal *ksig, sigset_t *set,

			 struct pt_regs *regs)

{
@@ -449,7 +439,7 @@ static int setup_frame32(struct ksignal *ksig, sigset_t *set, 
		(regs->psw.mask & ~PSW_MASK_ASC);

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



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

	regs->gprs[2] = sig;

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



	/* We forgot to include these in the sigcontext.
@@ -532,7 +522,7 @@ static int setup_rt_frame32(struct ksignal *ksig, sigset_t *set, 
		(regs->psw.mask & ~PSW_MASK_ASC);

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



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

	regs->gprs[2] = ksig->sig;

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

	regs->gprs[4] = (__force __u64) &frame->uc;

	regs->gprs[5] = task_thread_info(current)->last_break;

arch/s390/kernel/signal.c

+2 −12
Original line number Diff line number Diff line
@@ -309,16 +309,6 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size) 
	return (void __user *)((sp - frame_size) & -8ul);

}



static inline int map_signal(int sig)

{

	if (current_thread_info()->exec_domain

	    && current_thread_info()->exec_domain->signal_invmap

	    && sig < 32)

		return current_thread_info()->exec_domain->signal_invmap[sig];

	else

		return sig;

}



static int setup_frame(int sig, struct k_sigaction *ka,

		       sigset_t *set, struct pt_regs * regs)

{
@@ -386,7 +376,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, 
		(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (unsigned long) ka->sa.sa_handler | PSW_ADDR_AMODE;



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

	regs->gprs[2] = sig;

	regs->gprs[3] = (unsigned long) &frame->sc;



	/* We forgot to include these in the sigcontext.
@@ -468,7 +458,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, 
		(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (unsigned long) ksig->ka.sa.sa_handler | PSW_ADDR_AMODE;



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

	regs->gprs[2] = ksig->sig;

	regs->gprs[3] = (unsigned long) &frame->info;

	regs->gprs[4] = (unsigned long) &frame->uc;

	regs->gprs[5] = task_thread_info(current)->last_break;