diff options
| -rw-r--r-- | kernel/sched.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 6da1fcef725a..b19cc5b79e26 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -4801,18 +4801,18 @@ static void show_task(struct task_struct *p) | |||
| 4801 | unsigned state; | 4801 | unsigned state; |
| 4802 | 4802 | ||
| 4803 | state = p->state ? __ffs(p->state) + 1 : 0; | 4803 | state = p->state ? __ffs(p->state) + 1 : 0; |
| 4804 | printk("%-13.13s %c", p->comm, | 4804 | printk(KERN_INFO "%-13.13s %c", p->comm, |
| 4805 | state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?'); | 4805 | state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?'); |
| 4806 | #if BITS_PER_LONG == 32 | 4806 | #if BITS_PER_LONG == 32 |
| 4807 | if (state == TASK_RUNNING) | 4807 | if (state == TASK_RUNNING) |
| 4808 | printk(" running "); | 4808 | printk(KERN_CONT " running "); |
| 4809 | else | 4809 | else |
| 4810 | printk(" %08lx ", thread_saved_pc(p)); | 4810 | printk(KERN_CONT " %08lx ", thread_saved_pc(p)); |
| 4811 | #else | 4811 | #else |
| 4812 | if (state == TASK_RUNNING) | 4812 | if (state == TASK_RUNNING) |
| 4813 | printk(" running task "); | 4813 | printk(KERN_CONT " running task "); |
| 4814 | else | 4814 | else |
| 4815 | printk(" %016lx ", thread_saved_pc(p)); | 4815 | printk(KERN_CONT " %016lx ", thread_saved_pc(p)); |
| 4816 | #endif | 4816 | #endif |
| 4817 | #ifdef CONFIG_DEBUG_STACK_USAGE | 4817 | #ifdef CONFIG_DEBUG_STACK_USAGE |
| 4818 | { | 4818 | { |
| @@ -4822,7 +4822,7 @@ static void show_task(struct task_struct *p) | |||
| 4822 | free = (unsigned long)n - (unsigned long)end_of_stack(p); | 4822 | free = (unsigned long)n - (unsigned long)end_of_stack(p); |
| 4823 | } | 4823 | } |
| 4824 | #endif | 4824 | #endif |
| 4825 | printk("%5lu %5d %6d\n", free, p->pid, p->parent->pid); | 4825 | printk(KERN_CONT "%5lu %5d %6d\n", free, p->pid, p->parent->pid); |
| 4826 | 4826 | ||
| 4827 | if (state != TASK_RUNNING) | 4827 | if (state != TASK_RUNNING) |
| 4828 | show_stack(p, NULL); | 4828 | show_stack(p, NULL); |
| @@ -5605,20 +5605,20 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu) | |||
| 5605 | } | 5605 | } |
| 5606 | 5606 | ||
| 5607 | if (!group->__cpu_power) { | 5607 | if (!group->__cpu_power) { |
| 5608 | printk("\n"); | 5608 | printk(KERN_CONT "\n"); |
| 5609 | printk(KERN_ERR "ERROR: domain->cpu_power not " | 5609 | printk(KERN_ERR "ERROR: domain->cpu_power not " |
| 5610 | "set\n"); | 5610 | "set\n"); |
| 5611 | break; | 5611 | break; |
| 5612 | } | 5612 | } |
| 5613 | 5613 | ||
| 5614 | if (!cpus_weight(group->cpumask)) { | 5614 | if (!cpus_weight(group->cpumask)) { |
| 5615 | printk("\n"); | 5615 | printk(KERN_CONT "\n"); |
| 5616 | printk(KERN_ERR "ERROR: empty group\n"); | 5616 | printk(KERN_ERR "ERROR: empty group\n"); |
| 5617 | break; | 5617 | break; |
| 5618 | } | 5618 | } |
| 5619 | 5619 | ||
| 5620 | if (cpus_intersects(groupmask, group->cpumask)) { | 5620 | if (cpus_intersects(groupmask, group->cpumask)) { |
| 5621 | printk("\n"); | 5621 | printk(KERN_CONT "\n"); |
| 5622 | printk(KERN_ERR "ERROR: repeated CPUs\n"); | 5622 | printk(KERN_ERR "ERROR: repeated CPUs\n"); |
| 5623 | break; | 5623 | break; |
| 5624 | } | 5624 | } |
| @@ -5626,11 +5626,11 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu) | |||
| 5626 | cpus_or(groupmask, groupmask, group->cpumask); | 5626 | cpus_or(groupmask, groupmask, group->cpumask); |
| 5627 | 5627 | ||
| 5628 | cpumask_scnprintf(str, NR_CPUS, group->cpumask); | 5628 | cpumask_scnprintf(str, NR_CPUS, group->cpumask); |
| 5629 | printk(" %s", str); | 5629 | printk(KERN_CONT " %s", str); |
| 5630 | 5630 | ||
| 5631 | group = group->next; | 5631 | group = group->next; |
| 5632 | } while (group != sd->groups); | 5632 | } while (group != sd->groups); |
| 5633 | printk("\n"); | 5633 | printk(KERN_CONT "\n"); |
| 5634 | 5634 | ||
| 5635 | if (!cpus_equal(sd->span, groupmask)) | 5635 | if (!cpus_equal(sd->span, groupmask)) |
| 5636 | printk(KERN_ERR "ERROR: groups don't span " | 5636 | printk(KERN_ERR "ERROR: groups don't span " |
