提交 cc4ea795 编写于 作者: I Ingo Molnar

sched: add KERN_CONT annotation

printk: add the KERN_CONT annotation (which is empty string but via
which checkpatch.pl can notice that the lacking KERN_ level is fine).
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 d8016491
...@@ -4801,18 +4801,18 @@ static void show_task(struct task_struct *p) ...@@ -4801,18 +4801,18 @@ static void show_task(struct task_struct *p)
unsigned state; unsigned state;
state = p->state ? __ffs(p->state) + 1 : 0; 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] : '?'); state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
#if BITS_PER_LONG == 32 #if BITS_PER_LONG == 32
if (state == TASK_RUNNING) if (state == TASK_RUNNING)
printk(" running "); printk(KERN_CONT " running ");
else else
printk(" %08lx ", thread_saved_pc(p)); printk(KERN_CONT " %08lx ", thread_saved_pc(p));
#else #else
if (state == TASK_RUNNING) if (state == TASK_RUNNING)
printk(" running task "); printk(KERN_CONT " running task ");
else else
printk(" %016lx ", thread_saved_pc(p)); printk(KERN_CONT " %016lx ", thread_saved_pc(p));
#endif #endif
#ifdef CONFIG_DEBUG_STACK_USAGE #ifdef CONFIG_DEBUG_STACK_USAGE
{ {
...@@ -4822,7 +4822,7 @@ static void show_task(struct task_struct *p) ...@@ -4822,7 +4822,7 @@ static void show_task(struct task_struct *p)
free = (unsigned long)n - (unsigned long)end_of_stack(p); free = (unsigned long)n - (unsigned long)end_of_stack(p);
} }
#endif #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) if (state != TASK_RUNNING)
show_stack(p, NULL); show_stack(p, NULL);
...@@ -5605,20 +5605,20 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu) ...@@ -5605,20 +5605,20 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu)
} }
if (!group->__cpu_power) { if (!group->__cpu_power) {
printk("\n"); printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: domain->cpu_power not " printk(KERN_ERR "ERROR: domain->cpu_power not "
"set\n"); "set\n");
break; break;
} }
if (!cpus_weight(group->cpumask)) { if (!cpus_weight(group->cpumask)) {
printk("\n"); printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: empty group\n"); printk(KERN_ERR "ERROR: empty group\n");
break; break;
} }
if (cpus_intersects(groupmask, group->cpumask)) { if (cpus_intersects(groupmask, group->cpumask)) {
printk("\n"); printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: repeated CPUs\n"); printk(KERN_ERR "ERROR: repeated CPUs\n");
break; break;
} }
...@@ -5626,11 +5626,11 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu) ...@@ -5626,11 +5626,11 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu)
cpus_or(groupmask, groupmask, group->cpumask); cpus_or(groupmask, groupmask, group->cpumask);
cpumask_scnprintf(str, NR_CPUS, group->cpumask); cpumask_scnprintf(str, NR_CPUS, group->cpumask);
printk(" %s", str); printk(KERN_CONT " %s", str);
group = group->next; group = group->next;
} while (group != sd->groups); } while (group != sd->groups);
printk("\n"); printk(KERN_CONT "\n");
if (!cpus_equal(sd->span, groupmask)) if (!cpus_equal(sd->span, groupmask))
printk(KERN_ERR "ERROR: groups don't span " printk(KERN_ERR "ERROR: groups don't span "
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册