diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 12:30:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 12:30:27 -0400 |
| commit | 90e66dd93d53f346e6f652f6eb6512f576917ee7 (patch) | |
| tree | 472026acf37968983415dae8f03948eb8a211fe7 /arch/c6x/kernel/signal.c | |
| parent | f0a08fcb5972167e55faa330c4a24fbaa3328b1f (diff) | |
| parent | b9b8722d4704137d1c85b8e62364b487cbbe8bf0 (diff) | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull C6X changes from Mark Salter:
- remove use of legacy irqs which really wasn't needed
- add support for C66x SoC on EVMC6678 board
- clean up compiler warning
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
C6X: clean up compiler warning
C6X: add basic support for TMS320C6678 SoC
C6X: remove dependence on legacy IRQs
C6X: remove megamod-pic requirement on direct-mapped core pic
Diffstat (limited to 'arch/c6x/kernel/signal.c')
| -rw-r--r-- | arch/c6x/kernel/signal.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c index 3d8f3c22a94f..3998b24e26f2 100644 --- a/arch/c6x/kernel/signal.c +++ b/arch/c6x/kernel/signal.c | |||
| @@ -249,8 +249,6 @@ static void handle_signal(int sig, | |||
| 249 | siginfo_t *info, struct k_sigaction *ka, | 249 | siginfo_t *info, struct k_sigaction *ka, |
| 250 | struct pt_regs *regs, int syscall) | 250 | struct pt_regs *regs, int syscall) |
| 251 | { | 251 | { |
| 252 | int ret; | ||
| 253 | |||
| 254 | /* Are we from a system call? */ | 252 | /* Are we from a system call? */ |
| 255 | if (syscall) { | 253 | if (syscall) { |
| 256 | /* If so, check system call restarting.. */ | 254 | /* If so, check system call restarting.. */ |