diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-20 17:39:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-20 17:39:29 -0800 |
| commit | 9b2f107fc1b33b5230443acbaca6f52ccfa68e5e (patch) | |
| tree | c1274d5ac53b396315e5a4971304c5d0656e23b2 | |
| parent | 59b17c275e392aa817e588108b9e808c2913b6cb (diff) | |
| parent | 0233f53fa39d43e2f923c3485502b0461cecc0d7 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | arch/x86_64/kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c index 8f069cf3d6e9..e9aa2ca0b55d 100644 --- a/arch/x86_64/kernel/signal.c +++ b/arch/x86_64/kernel/signal.c @@ -357,7 +357,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, #endif /* Are we from a system call? */ - if (regs->orig_rax >= 0) { + if ((long)regs->orig_rax >= 0) { /* If so, check system call restarting.. */ switch (regs->rax) { case -ERESTART_RESTARTBLOCK: @@ -442,7 +442,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) no_signal: /* Did we come from a system call? */ - if (regs->orig_rax >= 0) { + if ((long)regs->orig_rax >= 0) { /* Restart the system call - no handlers present */ long res = regs->rax; if (res == -ERESTARTNOHAND || |