diff options
Diffstat (limited to 'kernel/rcutree_trace.c')
| -rw-r--r-- | kernel/rcutree_trace.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c index 3b0c0986afc0..9feffa4c0695 100644 --- a/kernel/rcutree_trace.c +++ b/kernel/rcutree_trace.c | |||
| @@ -48,11 +48,6 @@ | |||
| 48 | 48 | ||
| 49 | #ifdef CONFIG_RCU_BOOST | 49 | #ifdef CONFIG_RCU_BOOST |
| 50 | 50 | ||
| 51 | DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_status); | ||
| 52 | DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_cpu); | ||
| 53 | DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_loops); | ||
| 54 | DECLARE_PER_CPU(char, rcu_cpu_has_work); | ||
| 55 | |||
| 56 | static char convert_kthread_status(unsigned int kthread_status) | 51 | static char convert_kthread_status(unsigned int kthread_status) |
| 57 | { | 52 | { |
| 58 | if (kthread_status > RCU_KTHREAD_MAX) | 53 | if (kthread_status > RCU_KTHREAD_MAX) |
| @@ -66,11 +61,11 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp) | |||
| 66 | { | 61 | { |
| 67 | if (!rdp->beenonline) | 62 | if (!rdp->beenonline) |
| 68 | return; | 63 | return; |
| 69 | seq_printf(m, "%3d%cc=%lu g=%lu pq=%d pqc=%lu qp=%d", | 64 | seq_printf(m, "%3d%cc=%lu g=%lu pq=%d pgp=%lu qp=%d", |
| 70 | rdp->cpu, | 65 | rdp->cpu, |
| 71 | cpu_is_offline(rdp->cpu) ? '!' : ' ', | 66 | cpu_is_offline(rdp->cpu) ? '!' : ' ', |
| 72 | rdp->completed, rdp->gpnum, | 67 | rdp->completed, rdp->gpnum, |
| 73 | rdp->passed_quiesc, rdp->passed_quiesc_completed, | 68 | rdp->passed_quiesce, rdp->passed_quiesce_gpnum, |
| 74 | rdp->qs_pending); | 69 | rdp->qs_pending); |
| 75 | #ifdef CONFIG_NO_HZ | 70 | #ifdef CONFIG_NO_HZ |
| 76 | seq_printf(m, " dt=%d/%d/%d df=%lu", | 71 | seq_printf(m, " dt=%d/%d/%d df=%lu", |
| @@ -144,7 +139,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp) | |||
| 144 | rdp->cpu, | 139 | rdp->cpu, |
| 145 | cpu_is_offline(rdp->cpu) ? "\"N\"" : "\"Y\"", | 140 | cpu_is_offline(rdp->cpu) ? "\"N\"" : "\"Y\"", |
| 146 | rdp->completed, rdp->gpnum, | 141 | rdp->completed, rdp->gpnum, |
| 147 | rdp->passed_quiesc, rdp->passed_quiesc_completed, | 142 | rdp->passed_quiesce, rdp->passed_quiesce_gpnum, |
| 148 | rdp->qs_pending); | 143 | rdp->qs_pending); |
| 149 | #ifdef CONFIG_NO_HZ | 144 | #ifdef CONFIG_NO_HZ |
| 150 | seq_printf(m, ",%d,%d,%d,%lu", | 145 | seq_printf(m, ",%d,%d,%d,%lu", |
| @@ -175,7 +170,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp) | |||
| 175 | 170 | ||
| 176 | static int show_rcudata_csv(struct seq_file *m, void *unused) | 171 | static int show_rcudata_csv(struct seq_file *m, void *unused) |
| 177 | { | 172 | { |
| 178 | seq_puts(m, "\"CPU\",\"Online?\",\"c\",\"g\",\"pq\",\"pqc\",\"pq\","); | 173 | seq_puts(m, "\"CPU\",\"Online?\",\"c\",\"g\",\"pq\",\"pgp\",\"pq\","); |
| 179 | #ifdef CONFIG_NO_HZ | 174 | #ifdef CONFIG_NO_HZ |
| 180 | seq_puts(m, "\"dt\",\"dt nesting\",\"dt NMI nesting\",\"df\","); | 175 | seq_puts(m, "\"dt\",\"dt nesting\",\"dt NMI nesting\",\"df\","); |
| 181 | #endif /* #ifdef CONFIG_NO_HZ */ | 176 | #endif /* #ifdef CONFIG_NO_HZ */ |