Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71317
b: refs/heads/master
c: cc4ea79
h: refs/heads/master
i:
  71315: 1453f10
v: v3
  • Loading branch information
Ingo Molnar committed Oct 18, 2007
1 parent 4606b8c commit 2dec1cc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d80164916221216dedbd5d0e8423daca9e7682ea
refs/heads/master: cc4ea79588e688ea9b1161650979a194dd709169
22 changes: 11 additions & 11 deletions trunk/kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -4801,18 +4801,18 @@ static void show_task(struct task_struct *p)
unsigned state;

state = p->state ? __ffs(p->state) + 1 : 0;
printk("%-13.13s %c", p->comm,
printk(KERN_INFO "%-13.13s %c", p->comm,
state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
#if BITS_PER_LONG == 32
if (state == TASK_RUNNING)
printk(" running ");
printk(KERN_CONT " running ");
else
printk(" %08lx ", thread_saved_pc(p));
printk(KERN_CONT " %08lx ", thread_saved_pc(p));
#else
if (state == TASK_RUNNING)
printk(" running task ");
printk(KERN_CONT " running task ");
else
printk(" %016lx ", thread_saved_pc(p));
printk(KERN_CONT " %016lx ", thread_saved_pc(p));
#endif
#ifdef CONFIG_DEBUG_STACK_USAGE
{
Expand All @@ -4822,7 +4822,7 @@ static void show_task(struct task_struct *p)
free = (unsigned long)n - (unsigned long)end_of_stack(p);
}
#endif
printk("%5lu %5d %6d\n", free, p->pid, p->parent->pid);
printk(KERN_CONT "%5lu %5d %6d\n", free, p->pid, p->parent->pid);

if (state != TASK_RUNNING)
show_stack(p, NULL);
Expand Down Expand Up @@ -5605,32 +5605,32 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu)
}

if (!group->__cpu_power) {
printk("\n");
printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: domain->cpu_power not "
"set\n");
break;
}

if (!cpus_weight(group->cpumask)) {
printk("\n");
printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: empty group\n");
break;
}

if (cpus_intersects(groupmask, group->cpumask)) {
printk("\n");
printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: repeated CPUs\n");
break;
}

cpus_or(groupmask, groupmask, group->cpumask);

cpumask_scnprintf(str, NR_CPUS, group->cpumask);
printk(" %s", str);
printk(KERN_CONT " %s", str);

group = group->next;
} while (group != sd->groups);
printk("\n");
printk(KERN_CONT "\n");

if (!cpus_equal(sd->span, groupmask))
printk(KERN_ERR "ERROR: groups don't span "
Expand Down

0 comments on commit 2dec1cc

Please sign in to comment.