From cdfb5263a0695e9fe0a6ebaa5ea6fa39492c96c3 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Sat, 22 Jan 2011 17:13:14 -0500 Subject: [PATCH] sched: dump preempt_count and offset values in __might_sleep() This is one of several extractions from the merge up to 33-rc8. See it in a git tip repo with: git diff 5f854cfc024622e4aae14d7cf422f6ff86278688^2 \ 5f854cfc024622e4aae14d7cf422f6ff86278688 kernel/sched.c You can find the origin of this change in the tip merge commit: commit 5f854cfc024622e4aae14d7cf422f6ff86278688 Merge: cc24da0 4ec62b2 Author: Thomas Gleixner Date: Sun Feb 21 20:17:22 2010 +0100 Forward to 2.6.33-rc8 Merge branch 'linus' into rt/head with a pile of conflicts. Signed-off-by: Thomas Gleixner Normally there are not significant changes/additions in a merge commit that are not from any other "normal" commit. But in this case there are, so break them out into separate explicit commits. Signed-off-by: Paul Gortmaker --- kernel/sched.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 80bc0cf..56ad49c 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -8243,7 +8243,8 @@ void __might_sleep(const char *file, int line, int preempt_offset) "BUG: sleeping function called from invalid context at %s:%d\n", file, line); printk(KERN_ERR - "in_atomic(): %d, irqs_disabled(): %d, pid: %d, name: %s\n", + "pcnt: %x %d in_atomic(): %d, irqs_disabled(): %d, pid: %d, name: %s\n", + preempt_count(), preempt_offset, in_atomic(), irqs_disabled(), current->pid, current->comm); -- 1.7.0.4