Commit ed7fa26b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig

Merge

parents fb3f7887 e53f5fc1
...@@ -1294,7 +1294,7 @@ do_clock_nanosleep(clockid_t which_clock, int flags, struct timespec *tsave) ...@@ -1294,7 +1294,7 @@ do_clock_nanosleep(clockid_t which_clock, int flags, struct timespec *tsave)
} }
restart_block->fn = clock_nanosleep_restart; restart_block->fn = clock_nanosleep_restart;
restart_block->arg0 = which_clock; restart_block->arg0 = which_clock;
restart_block->arg1 = (int)tsave; restart_block->arg1 = (unsigned long)tsave;
restart_block->arg2 = new_timer.expires; restart_block->arg2 = new_timer.expires;
return -ERESTART_RESTARTBLOCK; return -ERESTART_RESTARTBLOCK;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment