diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-01-04 05:28:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-04 05:28:41 -0800 |
| commit | e486b6b7c8e9733ee58404ba2658bab08febbf1d (patch) | |
| tree | 2462b6aa1cb3dfcfc50b5985ba67ee629afaab8e /kernel | |
| parent | fe52f9669c249f2bc9c44c541a83b0c18120cb0d (diff) | |
| download | history-e486b6b7c8e9733ee58404ba2658bab08febbf1d.tar.gz | |
[PATCH] suppress might_sleep() if oopsing
We can call might_sleep() functions on the oops handling path (under do_exit).
There seem little point in emitting spurious might_sleep() warnings into the
logs after the kernel has oopsed.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index a356f39ea93824..4c10b10c05c7aa 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -4631,7 +4631,7 @@ void __might_sleep(char *file, int line) static unsigned long prev_jiffy; /* ratelimiting */ if ((in_atomic() || irqs_disabled()) && - system_state == SYSTEM_RUNNING) { + system_state == SYSTEM_RUNNING && !oops_in_progress) { if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) return; prev_jiffy = jiffies; |