diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /arch/frv | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index 6b0a2b6fed6a..0974c0ecc594 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c | |||
| @@ -527,7 +527,7 @@ static void do_signal(void) | |||
| 527 | 527 | ||
| 528 | no_signal: | 528 | no_signal: |
| 529 | /* Did we come from a system call? */ | 529 | /* Did we come from a system call? */ |
| 530 | if (__frame->syscallno >= 0) { | 530 | if (__frame->syscallno != -1) { |
| 531 | /* Restart the system call - no handlers present */ | 531 | /* Restart the system call - no handlers present */ |
| 532 | switch (__frame->gr8) { | 532 | switch (__frame->gr8) { |
| 533 | case -ERESTARTNOHAND: | 533 | case -ERESTARTNOHAND: |