diff --git a/[refs] b/[refs] index 0943d281dd75..6f6ca3f8df56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fadfc8e930dcaf502b49a0a0170ba8ebe9a34c49 +refs/heads/master: 5b149bcc230e4696a1d893504bed38aeb3832314 diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c index feddf817baa5..c2a8ccfc2882 100644 --- a/trunk/kernel/timer.c +++ b/trunk/kernel/timer.c @@ -1344,11 +1344,10 @@ fastcall signed long __sched schedule_timeout(signed long timeout) * should never happens anyway). You just have the printk() * that will tell you if something is gone wrong and where. */ - if (timeout < 0) - { + if (timeout < 0) { printk(KERN_ERR "schedule_timeout: wrong timeout " - "value %lx from %p\n", timeout, - __builtin_return_address(0)); + "value %lx\n", timeout); + dump_stack(); current->state = TASK_RUNNING; goto out; }