diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 18:20:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 18:20:12 -0400 |
| commit | 2990821d0e38d2bfc556ad39d709b5f8a83c2ebd (patch) | |
| tree | 666da0573384cf73e8a6e2e60e4ef79ff92a2b5b /arch/mips/kernel/syscall.c | |
| parent | 869c34f5208adde010065c387354f2ebe4ec3bfc (diff) | |
| parent | 9ced975711d605d7deb27ef027e0f9816a51b479 (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (26 commits)
MIPS: Alchemy: Fix reset for MTX-1 and XXS1500
MIPS: MTX-1: Make au1000_eth probe all PHY addresses
MIPS: Jz4740: Add HAVE_CLK
MIPS: Move idle task creation to work queue
MIPS, Perf-events: Use unsigned delta for right shift in event update
MIPS, Perf-events: Work with the new callchain interface
MIPS, Perf-events: Fix event check in validate_event()
MIPS, Perf-events: Work with the new PMU interface
MIPS, Perf-events: Work with irq_work
MIPS: Fix always CONFIG_LOONGSON_UART_BASE=y
MIPS: Loongson: Fix potentially wrong string handling
MIPS: Fix GCC-4.6 'set but not used' warning in arch/mips/mm/init.c
MIPS: Fix GCC-4.6 'set but not used' warning in ieee754int.h
MIPS: Remove unused code from arch/mips/kernel/syscall.c
MIPS: Fix GCC-4.6 'set but not used' warning in signal*.c
MIPS: MSP: Fix MSP71xx bpci interrupt handler return value
MIPS: Select R4K timer lib for all MSP platforms
MIPS: Loongson: Remove ad-hoc cmdline default
MIPS: Clear the correct flag in sysmips(MIPS_FIXADE, ...).
MIPS: Add an unreachable return statement to satisfy buggy GCCs.
...
Diffstat (limited to 'arch/mips/kernel/syscall.c')
| -rw-r--r-- | arch/mips/kernel/syscall.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 1dc6edff45e..58beabf50b3 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c | |||
| @@ -383,12 +383,11 @@ save_static_function(sys_sysmips); | |||
| 383 | static int __used noinline | 383 | static int __used noinline |
| 384 | _sys_sysmips(nabi_no_regargs struct pt_regs regs) | 384 | _sys_sysmips(nabi_no_regargs struct pt_regs regs) |
| 385 | { | 385 | { |
| 386 | long cmd, arg1, arg2, arg3; | 386 | long cmd, arg1, arg2; |
| 387 | 387 | ||
| 388 | cmd = regs.regs[4]; | 388 | cmd = regs.regs[4]; |
| 389 | arg1 = regs.regs[5]; | 389 | arg1 = regs.regs[5]; |
| 390 | arg2 = regs.regs[6]; | 390 | arg2 = regs.regs[6]; |
| 391 | arg3 = regs.regs[7]; | ||
| 392 | 391 | ||
| 393 | switch (cmd) { | 392 | switch (cmd) { |
| 394 | case MIPS_ATOMIC_SET: | 393 | case MIPS_ATOMIC_SET: |
| @@ -405,7 +404,7 @@ _sys_sysmips(nabi_no_regargs struct pt_regs regs) | |||
| 405 | if (arg1 & 2) | 404 | if (arg1 & 2) |
| 406 | set_thread_flag(TIF_LOGADE); | 405 | set_thread_flag(TIF_LOGADE); |
| 407 | else | 406 | else |
| 408 | clear_thread_flag(TIF_FIXADE); | 407 | clear_thread_flag(TIF_LOGADE); |
| 409 | 408 | ||
| 410 | return 0; | 409 | return 0; |
| 411 | 410 | ||