lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched: clean up __might_sleep()

Browse Source 
add KERN_ to the printout and clean up the flow a bit.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2008-08-28 11:34:43 +02:00
parent 29cbef4869
commit aef745fca0
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/sched.c
View File

@@ -8226,20 +8226,25 @@ void __might_sleep(char *file, int line)
#ifdef in_atomic #ifdef in_atomic
static unsigned long prev_jiffy; /* ratelimiting */ static unsigned long prev_jiffy; /* ratelimiting */
if ((in_atomic() || irqs_disabled()) && if ((!in_atomic() && !irqs_disabled()) ||
system_state == SYSTEM_RUNNING && !oops_in_progress) { system_state != SYSTEM_RUNNING || oops_in_progress)
return;
if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
return; return;
prev_jiffy = jiffies; prev_jiffy = jiffies;
printk(KERN_ERR "BUG: sleeping function called from invalid"
" context at %s:%d\n", file, line); printk(KERN_ERR
printk("in_atomic():%d, irqs_disabled():%d, pid: %d, name: %s\n", "BUG: sleeping function called from invalid context at %s:%d\n",
in_atomic(), irqs_disabled(), current->pid, current->comm); file, line);
printk(KERN_ERR
"in_atomic(): %d, irqs_disabled(): %d, pid: %d, name: %s\n",
in_atomic(), irqs_disabled(),
current->pid, current->comm);
debug_show_held_locks(current); debug_show_held_locks(current);
if (irqs_disabled()) if (irqs_disabled())
print_irqtrace_events(current); print_irqtrace_events(current);
dump_stack(); dump_stack();
}
#endif #endif
} }
EXPORT_SYMBOL(__might_sleep); EXPORT_SYMBOL(__might_sleep);