From b54569f5a30bde9e85f38282b26ad2e10e995f06 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Fri, 21 Sep 2012 14:15:05 -0700 Subject: [PATCH] --- yaml --- r: 338811 b: refs/heads/master c: eee058826100e5a344f11601e0c47baeaf07c77b h: refs/heads/master i: 338809: 77a83038dd126332b2c45cdce3a37e54faec265d 338807: e8730099ae6df43bd761987d19b13f81dcc910a1 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 17371af2687e..e1431f572818 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b637a328bd4f43a0e146d1eef0142b650ba0d644 +refs/heads/master: eee058826100e5a344f11601e0c47baeaf07c77b diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index e78538712df0..8f4de3a7c1f7 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -947,8 +947,9 @@ static void print_other_cpu_stall(struct rcu_state *rsp) raw_spin_unlock_irqrestore(&rnp->lock, flags); print_cpu_stall_info_end(); - printk(KERN_CONT "(detected by %d, t=%ld jiffies)\n", - smp_processor_id(), (long)(jiffies - rsp->gp_start)); + pr_cont("(detected by %d, t=%ld jiffies, g=%lu, c=%lu)\n", + smp_processor_id(), (long)(jiffies - rsp->gp_start), + rsp->gpnum, rsp->completed); if (ndetected == 0) printk(KERN_ERR "INFO: Stall ended before state dump start\n"); else if (!trigger_all_cpu_backtrace()) @@ -975,7 +976,8 @@ static void print_cpu_stall(struct rcu_state *rsp) print_cpu_stall_info_begin(); print_cpu_stall_info(rsp, smp_processor_id()); print_cpu_stall_info_end(); - printk(KERN_CONT " (t=%lu jiffies)\n", jiffies - rsp->gp_start); + pr_cont(" (t=%lu jiffies g=%lu c=%lu)\n", + jiffies - rsp->gp_start, rsp->gpnum, rsp->completed); if (!trigger_all_cpu_backtrace()) dump_stack();