git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ppc64
/
kernel
/
signal32.c
diff --git
a/arch/ppc64/kernel/signal32.c
b/arch/ppc64/kernel/signal32.c
index
106f008
..
79f7b84
100644
(file)
--- a/
arch/ppc64/kernel/signal32.c
+++ b/
arch/ppc64/kernel/signal32.c
@@
-189,7
+189,7
@@
static long restore_user_regs(struct pt_regs *regs,
elf_greg_t64 *gregs = (elf_greg_t64 *)regs;
int i;
long err = 0;
elf_greg_t64 *gregs = (elf_greg_t64 *)regs;
int i;
long err = 0;
- unsigned int save_r2;
+ unsigned int save_r2
= 0
;
#ifdef CONFIG_ALTIVEC
unsigned long msr;
#endif
#ifdef CONFIG_ALTIVEC
unsigned long msr;
#endif
@@
-472,10
+472,14
@@
static long copy_siginfo_to_user32(compat_siginfo_t __user *d, siginfo_t *s)
&d->si_addr);
break;
case __SI_POLL >> 16:
&d->si_addr);
break;
case __SI_POLL >> 16:
- case __SI_TIMER >> 16:
err |= __put_user(s->si_band, &d->si_band);
err |= __put_user(s->si_fd, &d->si_fd);
break;
err |= __put_user(s->si_band, &d->si_band);
err |= __put_user(s->si_fd, &d->si_fd);
break;
+ case __SI_TIMER >> 16:
+ err |= __put_user(s->si_tid, &d->si_tid);
+ err |= __put_user(s->si_overrun, &d->si_overrun);
+ err |= __put_user(s->si_int, &d->si_int);
+ break;
case __SI_RT >> 16: /* This is not generated by the kernel as of now. */
case __SI_MESGQ >> 16:
err |= __put_user(s->si_int, &d->si_int);
case __SI_RT >> 16: /* This is not generated by the kernel as of now. */
case __SI_MESGQ >> 16:
err |= __put_user(s->si_int, &d->si_int);
@@
-699,9
+703,7
@@
badframe:
printk("badframe in handle_rt_signal, regs=%p frame=%p newsp=%lx\n",
regs, frame, newsp);
#endif
printk("badframe in handle_rt_signal, regs=%p frame=%p newsp=%lx\n",
regs, frame, newsp);
#endif
- if (sig == SIGSEGV)
- ka->sa.sa_handler = SIG_DFL;
- force_sig(SIGSEGV, current);
+ force_sigsegv(sig, current);
}
static long do_setcontext32(struct ucontext32 __user *ucp, struct pt_regs *regs, int sig)
}
static long do_setcontext32(struct ucontext32 __user *ucp, struct pt_regs *regs, int sig)
@@
-864,9
+866,7
@@
badframe:
printk("badframe in handle_signal, regs=%p frame=%x newsp=%x\n",
regs, frame, *newspp);
#endif
printk("badframe in handle_signal, regs=%p frame=%x newsp=%x\n",
regs, frame, *newspp);
#endif
- if (sig == SIGSEGV)
- ka->sa.sa_handler = SIG_DFL;
- force_sig(SIGSEGV, current);
+ force_sigsegv(sig, current);
}
/*
}
/*
@@
-928,18
+928,16
@@
badframe:
int do_signal32(sigset_t *oldset, struct pt_regs *regs)
{
siginfo_t info;
int do_signal32(sigset_t *oldset, struct pt_regs *regs)
{
siginfo_t info;
- struct k_sigaction *ka;
unsigned int frame, newsp;
int signr, ret;
unsigned int frame, newsp;
int signr, ret;
+ struct k_sigaction ka;
if (!oldset)
oldset = ¤t->blocked;
newsp = frame = 0;
if (!oldset)
oldset = ¤t->blocked;
newsp = frame = 0;
- signr = get_signal_to_deliver(&info, regs, NULL);
-
- ka = (signr == 0)? NULL: ¤t->sighand->action[signr-1];
+ signr = get_signal_to_deliver(&info, &ka, regs, NULL);
if (TRAP(regs) == 0x0C00 /* System Call! */
&& regs->ccr & 0x10000000 /* error signalled */
if (TRAP(regs) == 0x0C00 /* System Call! */
&& regs->ccr & 0x10000000 /* error signalled */
@@
-950,7
+948,7
@@
int do_signal32(sigset_t *oldset, struct pt_regs *regs)
if (signr > 0
&& (ret == ERESTARTNOHAND || ret == ERESTART_RESTARTBLOCK
|| (ret == ERESTARTSYS
if (signr > 0
&& (ret == ERESTARTNOHAND || ret == ERESTART_RESTARTBLOCK
|| (ret == ERESTARTSYS
- && !(ka
->
sa.sa_flags & SA_RESTART)))) {
+ && !(ka
.
sa.sa_flags & SA_RESTART)))) {
/* make the system call return an EINTR error */
regs->result = -EINTR;
regs->gpr[3] = EINTR;
/* make the system call return an EINTR error */
regs->result = -EINTR;
regs->gpr[3] = EINTR;
@@
-969,7
+967,7
@@
int do_signal32(sigset_t *oldset, struct pt_regs *regs)
if (signr == 0)
return 0; /* no signals delivered */
if (signr == 0)
return 0; /* no signals delivered */
- if ((ka
->
sa.sa_flags & SA_ONSTACK) && current->sas_ss_size
+ if ((ka
.
sa.sa_flags & SA_ONSTACK) && current->sas_ss_size
&& (!on_sig_stack(regs->gpr[1])))
newsp = (current->sas_ss_sp + current->sas_ss_size);
else
&& (!on_sig_stack(regs->gpr[1])))
newsp = (current->sas_ss_sp + current->sas_ss_size);
else
@@
-977,17
+975,15
@@
int do_signal32(sigset_t *oldset, struct pt_regs *regs)
newsp &= ~0xfUL;
/* Whee! Actually deliver the signal. */
newsp &= ~0xfUL;
/* Whee! Actually deliver the signal. */
- if (ka
->
sa.sa_flags & SA_SIGINFO)
- handle_rt_signal32(signr, ka, &info, oldset, regs, newsp);
+ if (ka
.
sa.sa_flags & SA_SIGINFO)
+ handle_rt_signal32(signr,
&
ka, &info, oldset, regs, newsp);
else
else
- handle_signal32(signr, ka, &info, oldset, regs, newsp);
-
- if (ka->sa.sa_flags & SA_ONESHOT)
- ka->sa.sa_handler = SIG_DFL;
+ handle_signal32(signr, &ka, &info, oldset, regs, newsp);
- if (!(ka
->
sa.sa_flags & SA_NODEFER)) {
+ if (!(ka
.
sa.sa_flags & SA_NODEFER)) {
spin_lock_irq(¤t->sighand->siglock);
spin_lock_irq(¤t->sighand->siglock);
- sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask);
+ sigorsets(¤t->blocked, ¤t->blocked,
+ &ka.sa.sa_mask);
sigaddset(¤t->blocked, signr);
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
sigaddset(¤t->blocked, signr);
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);