forked from luck/tmp_suning_uos_patched
arm: 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: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
973f911f55
commit
a4980448ed
|
@ -23,7 +23,6 @@
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
struct task_struct;
|
struct task_struct;
|
||||||
struct exec_domain;
|
|
||||||
|
|
||||||
#include <asm/types.h>
|
#include <asm/types.h>
|
||||||
#include <asm/domain.h>
|
#include <asm/domain.h>
|
||||||
|
@ -53,7 +52,6 @@ struct thread_info {
|
||||||
int preempt_count; /* 0 => preemptable, <0 => bug */
|
int preempt_count; /* 0 => preemptable, <0 => bug */
|
||||||
mm_segment_t addr_limit; /* address limit */
|
mm_segment_t addr_limit; /* address limit */
|
||||||
struct task_struct *task; /* main task structure */
|
struct task_struct *task; /* main task structure */
|
||||||
struct exec_domain *exec_domain; /* execution domain */
|
|
||||||
__u32 cpu; /* cpu */
|
__u32 cpu; /* cpu */
|
||||||
__u32 cpu_domain; /* cpu domain */
|
__u32 cpu_domain; /* cpu domain */
|
||||||
struct cpu_context_save cpu_context; /* cpu context */
|
struct cpu_context_save cpu_context; /* cpu context */
|
||||||
|
@ -73,7 +71,6 @@ struct thread_info {
|
||||||
#define INIT_THREAD_INFO(tsk) \
|
#define INIT_THREAD_INFO(tsk) \
|
||||||
{ \
|
{ \
|
||||||
.task = &tsk, \
|
.task = &tsk, \
|
||||||
.exec_domain = &default_exec_domain, \
|
|
||||||
.flags = 0, \
|
.flags = 0, \
|
||||||
.preempt_count = INIT_PREEMPT_COUNT, \
|
.preempt_count = INIT_PREEMPT_COUNT, \
|
||||||
.addr_limit = KERNEL_DS, \
|
.addr_limit = KERNEL_DS, \
|
||||||
|
|
|
@ -66,7 +66,6 @@ int main(void)
|
||||||
DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
|
DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
|
||||||
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
|
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
|
||||||
DEFINE(TI_TASK, offsetof(struct thread_info, task));
|
DEFINE(TI_TASK, offsetof(struct thread_info, task));
|
||||||
DEFINE(TI_EXEC_DOMAIN, offsetof(struct thread_info, exec_domain));
|
|
||||||
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
|
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
|
||||||
DEFINE(TI_CPU_DOMAIN, offsetof(struct thread_info, cpu_domain));
|
DEFINE(TI_CPU_DOMAIN, offsetof(struct thread_info, cpu_domain));
|
||||||
DEFINE(TI_CPU_SAVE, offsetof(struct thread_info, cpu_context));
|
DEFINE(TI_CPU_SAVE, offsetof(struct thread_info, cpu_context));
|
||||||
|
|
|
@ -318,17 +318,6 @@ get_sigframe(struct ksignal *ksig, struct pt_regs *regs, int framesize)
|
||||||
return frame;
|
return frame;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* translate the signal
|
|
||||||
*/
|
|
||||||
static inline int map_sig(int sig)
|
|
||||||
{
|
|
||||||
struct thread_info *thread = current_thread_info();
|
|
||||||
if (sig < 32 && thread->exec_domain && thread->exec_domain->signal_invmap)
|
|
||||||
sig = thread->exec_domain->signal_invmap[sig];
|
|
||||||
return sig;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
setup_return(struct pt_regs *regs, struct ksignal *ksig,
|
setup_return(struct pt_regs *regs, struct ksignal *ksig,
|
||||||
unsigned long __user *rc, void __user *frame)
|
unsigned long __user *rc, void __user *frame)
|
||||||
|
@ -412,7 +401,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
regs->ARM_r0 = map_sig(ksig->sig);
|
regs->ARM_r0 = ksig->sig;
|
||||||
regs->ARM_sp = (unsigned long)frame;
|
regs->ARM_sp = (unsigned long)frame;
|
||||||
regs->ARM_lr = retcode;
|
regs->ARM_lr = retcode;
|
||||||
regs->ARM_pc = handler;
|
regs->ARM_pc = handler;
|
||||||
|
|
|
@ -505,12 +505,10 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason)
|
||||||
|
|
||||||
static int bad_syscall(int n, struct pt_regs *regs)
|
static int bad_syscall(int n, struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
struct thread_info *thread = current_thread_info();
|
|
||||||
siginfo_t info;
|
siginfo_t info;
|
||||||
|
|
||||||
if ((current->personality & PER_MASK) != PER_LINUX &&
|
if ((current->personality & PER_MASK) != PER_LINUX) {
|
||||||
thread->exec_domain->handler) {
|
send_sig(SIGSEGV, current, 1);
|
||||||
thread->exec_domain->handler(n, regs);
|
|
||||||
return regs->ARM_r0;
|
return regs->ARM_r0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user