diff options
author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /arch/um/os-Linux/signal.c | |
parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/um/os-Linux/signal.c')
-rw-r--r-- | arch/um/os-Linux/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 18e5c8b67eb8..b98f7ea2d2f6 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c | |||
@@ -119,7 +119,7 @@ void (*handlers[_NSIG])(int sig, struct sigcontext *sc); | |||
119 | 119 | ||
120 | void handle_signal(int sig, struct sigcontext *sc) | 120 | void handle_signal(int sig, struct sigcontext *sc) |
121 | { | 121 | { |
122 | unsigned long pending = 0; | 122 | unsigned long pending = 1UL << sig; |
123 | 123 | ||
124 | do { | 124 | do { |
125 | int nested, bail; | 125 | int nested, bail; |
@@ -134,7 +134,7 @@ void handle_signal(int sig, struct sigcontext *sc) | |||
134 | * have to return, and the upper handler will deal | 134 | * have to return, and the upper handler will deal |
135 | * with this interrupt. | 135 | * with this interrupt. |
136 | */ | 136 | */ |
137 | bail = to_irq_stack(sig, &pending); | 137 | bail = to_irq_stack(&pending); |
138 | if(bail) | 138 | if(bail) |
139 | return; | 139 | return; |
140 | 140 | ||