Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95103
b: refs/heads/master
c: af7fff9
h: refs/heads/master
i:
  95101: 3103189
  95099: 6b64abe
  95095: 6de3f07
  95087: 8dcc9a2
  95071: 1269bfa
  95039: 60b5564
  94975: fc5b720
v: v3
  • Loading branch information
Pavel Emelyanov authored and Linus Torvalds committed Apr 30, 2008
1 parent bd53167 commit 160846e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 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: e1401c6bbb289d154eb0d0c292cc9f8259e4af73
refs/heads/master: af7fff9c13d56657dc328c75590f401c99bcecd9
12 changes: 7 additions & 5 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,11 @@ static void handle_stop_signal(int sig, struct task_struct *p)
}
}

static inline int legacy_queue(struct sigpending *signals, int sig)
{
return (sig < SIGRTMIN) && sigismember(&signals->signal, sig);
}

static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
struct sigpending *signals)
{
Expand Down Expand Up @@ -721,9 +726,6 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
return 0;
}

#define LEGACY_QUEUE(sigptr, sig) \
(((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig)))

int print_fatal_signals;

static void print_fatal_signal(struct pt_regs *regs, int signr)
Expand Down Expand Up @@ -771,7 +773,7 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
/* Support queueing exactly one non-rt signal, so that we
can get more detailed information about the cause of
the signal. */
if (LEGACY_QUEUE(&t->pending, sig))
if (legacy_queue(&t->pending, sig))
goto out;

ret = send_signal(sig, info, t, &t->pending);
Expand Down Expand Up @@ -932,7 +934,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
if (sig_ignored(p, sig))
return ret;

if (LEGACY_QUEUE(&p->signal->shared_pending, sig))
if (legacy_queue(&p->signal->shared_pending, sig))
/* This is a non-RT signal and we already have one queued. */
return ret;

Expand Down

0 comments on commit 160846e

Please sign in to comment.