Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 11141
b: refs/heads/master
c: 129bc8f
h: refs/heads/master
i:
  11139: 7d100e3
v: v3
  • Loading branch information
Ralf Baechle committed Oct 29, 2005
1 parent e51ea1e commit c0f0270
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b490ff42709546d5cf6b631c1a84a5f4fcb020e4
refs/heads/master: 129bc8f78b468df6824dd1584829f10aa3a69c27
10 changes: 5 additions & 5 deletions trunk/arch/mips/kernel/process.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ extern int do_signal32(sigset_t *oldset, struct pt_regs *regs);
/*
* Native o32 and N64 ABI without DSP ASE
*/
extern void setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
extern int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set);
extern void setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
extern int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set, siginfo_t *info);

struct mips_abi mips_abi = {
Expand All @@ -79,9 +79,9 @@ struct mips_abi mips_abi = {
/*
* o32 compatibility on 64-bit kernels, without DSP ASE
*/
extern void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
extern int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set);
extern void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
extern int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set, siginfo_t *info);

struct mips_abi mips_abi_32 = {
Expand All @@ -95,7 +95,7 @@ struct mips_abi mips_abi_32 = {
/*
* N32 on 64-bit kernels, without DSP ASE
*/
extern void setup_rt_frame_n32(struct k_sigaction * ka, struct pt_regs *regs,
extern int setup_rt_frame_n32(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set, siginfo_t *info);

struct mips_abi mips_abi_n32 = {
Expand Down
26 changes: 15 additions & 11 deletions trunk/arch/mips/kernel/signal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ _sys_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
}

#ifdef CONFIG_TRAD_SIGNALS
void setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set)
{
struct sigframe *frame;
Expand Down Expand Up @@ -317,14 +317,15 @@ void setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
current->comm, current->pid,
frame, regs->cp0_epc, frame->regs[31]);
#endif
return;
return 1;

give_sigsegv:
force_sigsegv(signr, current);
return 0;
}
#endif

void setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set, siginfo_t *info)
{
struct rt_sigframe *frame;
Expand Down Expand Up @@ -376,18 +377,21 @@ void setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
current->comm, current->pid,
frame, regs->cp0_epc, regs->regs[31]);
#endif
return;
return 1;

give_sigsegv:
force_sigsegv(signr, current);
return 0;
}

extern void setup_rt_frame_n32(struct k_sigaction * ka,
struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info);

static inline void handle_signal(unsigned long sig, siginfo_t *info,
static inline int handle_signal(unsigned long sig, siginfo_t *info,
struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
{
int ret;

switch(regs->regs[0]) {
case ERESTART_RESTARTBLOCK:
case ERESTARTNOHAND:
Expand All @@ -407,16 +411,18 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info,
regs->regs[0] = 0; /* Don't deal with this again. */

if (sig_uses_siginfo(ka))
current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);
ret = current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);
else
current->thread.abi->setup_frame(ka, regs, sig, oldset);
ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);

spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&current->blocked,sig);
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);

return ret;
}

int do_signal(sigset_t *oldset, struct pt_regs *regs)
Expand All @@ -440,10 +446,8 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
oldset = &current->blocked;

signr = get_signal_to_deliver(&info, &ka, regs, NULL);
if (signr > 0) {
handle_signal(signr, &info, &ka, oldset, regs);
return 1;
}
if (signr > 0)
return handle_signal(signr, &info, &ka, oldset, regs);

no_signal:
/*
Expand Down
16 changes: 9 additions & 7 deletions trunk/arch/mips/kernel/signal32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,9 +769,11 @@ void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr,
force_sigsegv(signr, current);
}

static inline void handle_signal(unsigned long sig, siginfo_t *info,
static inline int handle_signal(unsigned long sig, siginfo_t *info,
struct k_sigaction *ka, sigset_t *oldset, struct pt_regs * regs)
{
int ret;

switch (regs->regs[0]) {
case ERESTART_RESTARTBLOCK:
case ERESTARTNOHAND:
Expand All @@ -791,16 +793,18 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info,
regs->regs[0] = 0; /* Don't deal with this again. */

if (ka->sa.sa_flags & SA_SIGINFO)
current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);
ret = current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);
else
current->thread.abi->setup_frame(ka, regs, sig, oldset);
ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);

spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&current->blocked,sig);
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);

return ret;
}

int do_signal32(sigset_t *oldset, struct pt_regs *regs)
Expand All @@ -824,10 +828,8 @@ int do_signal32(sigset_t *oldset, struct pt_regs *regs)
oldset = &current->blocked;

signr = get_signal_to_deliver(&info, &ka, regs, NULL);
if (signr > 0) {
handle_signal(signr, &info, &ka, oldset, regs);
return 1;
}
if (signr > 0)
return handle_signal(signr, &info, &ka, oldset, regs);

no_signal:
/*
Expand Down
5 changes: 3 additions & 2 deletions trunk/arch/mips/kernel/signal_n32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ _sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
force_sig(SIGSEGV, current);
}

void setup_rt_frame_n32(struct k_sigaction * ka,
int setup_rt_frame_n32(struct k_sigaction * ka,
struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info)
{
struct rt_sigframe_n32 *frame;
Expand Down Expand Up @@ -184,8 +184,9 @@ void setup_rt_frame_n32(struct k_sigaction * ka,
current->comm, current->pid,
frame, regs->cp0_epc, regs->regs[31]);
#endif
return;
return 1;

give_sigsegv:
force_sigsegv(signr, current);
return 0;
}

0 comments on commit c0f0270

Please sign in to comment.