Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29058
b: refs/heads/master
c: d09042d
h: refs/heads/master
v: v3
  • Loading branch information
Laurent MEYER authored and Linus Torvalds committed Jun 23, 2006
1 parent 4138087 commit 1a5b58b
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 785d55708c24c28d7646f3d1fe6c9f82fb714311
refs/heads/master: d09042da7284a86ffbdd18695f517a71514ed598
2 changes: 1 addition & 1 deletion trunk/arch/alpha/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ do_rt_sigreturn(struct rt_sigframe __user *frame, struct pt_regs *regs,
static inline void __user *
get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
{
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! on_sig_stack(sp))
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp))
sp = current->sas_ss_sp + current->sas_ss_size;

return (void __user *)((sp - frame_size) & -32ul);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/frv/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,

/* This is the X/Open sanctioned signal stack switching. */
if (ka->sa.sa_flags & SA_ONSTACK) {
if (! on_sig_stack(sp))
if (! sas_ss_flags(sp))
sp = current->sas_ss_sp + current->sas_ss_size;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/h8300/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)

/* This is the X/Open sanctioned signal stack switching. */
if (ka->sa.sa_flags & SA_ONSTACK) {
if (!on_sig_stack(usp))
if (!sas_ss_flags(usp))
usp = current->sas_ss_sp + current->sas_ss_size;
}
return (void *)((usp - frame_size) & -8UL);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/m68k/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)

/* This is the X/Open sanctioned signal stack switching. */
if (ka->sa.sa_flags & SA_ONSTACK) {
if (!on_sig_stack(usp))
if (!sas_ss_flags(usp))
usp = current->sas_ss_sp + current->sas_ss_size;
}
return (void __user *)((usp - frame_size) & -8UL);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/m68knommu/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)

/* This is the X/Open sanctioned signal stack switching. */
if (ka->sa.sa_flags & SA_ONSTACK) {
if (!on_sig_stack(usp))
if (!sas_ss_flags(usp))
usp = current->sas_ss_sp + current->sas_ss_size;
}
return (void *)((usp - frame_size) & -8UL);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/parisc/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
DBG(1,"get_sigframe: ka = %#lx, sp = %#lx, frame_size = %#lx\n",
(unsigned long)ka, sp, frame_size);

if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! on_sig_stack(sp))
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp))
sp = current->sas_ss_sp; /* Stacks grow up! */

DBG(1,"get_sigframe: Returning sp = %#lx\n", (unsigned long)sp);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sh64/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
static inline void __user *
get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
{
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! on_sig_stack(sp))
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp))
sp = current->sas_ss_sp + current->sas_ss_size;

return (void __user *)((sp - frame_size) & -8ul);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/v850/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
/* Default to using normal stack */
unsigned long sp = regs->gpr[GPR_SP];

if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! on_sig_stack(sp))
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp))
sp = current->sas_ss_sp + current->sas_ss_size;

return (void *)((sp - frame_size) & -8UL);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/xtensa/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
static inline void *
get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
{
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! on_sig_stack(sp))
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp))
sp = current->sas_ss_sp + current->sas_ss_size;

return (void *)((sp - frame_size) & -16ul);
Expand Down

0 comments on commit 1a5b58b

Please sign in to comment.