diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-12 21:38:02 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-10-12 21:38:02 -0600 |
commit | 492c032beccd53f807811b6c14909630d409dd8c (patch) | |
tree | 208550c6ccecb8f1b4f85edb91702ca2bdef855e /arch/mips/kernel/kspd.c | |
parent | f9d629c737cb6687216a0c540b5466a4bd8b070a (diff) | |
parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) |
Merge commit 'v2.6.36-rc7' into spi/next
Diffstat (limited to 'arch/mips/kernel/kspd.c')
-rw-r--r-- | arch/mips/kernel/kspd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c index 80e2ba694ba..29811f04339 100644 --- a/arch/mips/kernel/kspd.c +++ b/arch/mips/kernel/kspd.c @@ -251,7 +251,7 @@ void sp_work_handle_request(void) memset(&tz, 0, sizeof(tz)); if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv, (int)&tz, 0, 0)) == 0) - ret.retval = tv.tv_sec; + ret.retval = tv.tv_sec; break; case MTSP_SYSCALL_EXIT: |