aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-19 02:40:40 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 14:53:43 -0400
commitba25f9dcc4ea6e30839fcab5a5516f2176d5bfed (patch)
tree3123c03b25dd5c0cd24b6ab4fc16731217838157 /kernel/sched.c
parent9a2e70572e94e21e7ec4186702d045415422bda0 (diff)
Use helpers to obtain task pid in printks
The task_struct->pid member is going to be deprecated, so start using the helpers (task_pid_nr/task_pid_vnr/task_pid_nr_ns) in the kernel. The first thing to start with is the pid, printed to dmesg - in this case we may safely use task_pid_nr(). Besides, printks produce more (much more) than a half of all the explicit pid usage. [akpm@linux-foundation.org: git-drm went and changed lots of stuff] Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 9d458504e3a6..a7e30462600f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3502,7 +3502,7 @@ EXPORT_SYMBOL(sub_preempt_count);
3502static noinline void __schedule_bug(struct task_struct *prev) 3502static noinline void __schedule_bug(struct task_struct *prev)
3503{ 3503{
3504 printk(KERN_ERR "BUG: scheduling while atomic: %s/0x%08x/%d\n", 3504 printk(KERN_ERR "BUG: scheduling while atomic: %s/0x%08x/%d\n",
3505 prev->comm, preempt_count(), prev->pid); 3505 prev->comm, preempt_count(), task_pid_nr(prev));
3506 debug_show_held_locks(prev); 3506 debug_show_held_locks(prev);
3507 if (irqs_disabled()) 3507 if (irqs_disabled())
3508 print_irqtrace_events(prev); 3508 print_irqtrace_events(prev);
@@ -4865,7 +4865,8 @@ static void show_task(struct task_struct *p)
4865 free = (unsigned long)n - (unsigned long)end_of_stack(p); 4865 free = (unsigned long)n - (unsigned long)end_of_stack(p);
4866 } 4866 }
4867#endif 4867#endif
4868 printk(KERN_CONT "%5lu %5d %6d\n", free, p->pid, p->parent->pid); 4868 printk(KERN_CONT "%5lu %5d %6d\n", free,
4869 task_pid_nr(p), task_pid_nr(p->parent));
4869 4870
4870 if (state != TASK_RUNNING) 4871 if (state != TASK_RUNNING)
4871 show_stack(p, NULL); 4872 show_stack(p, NULL);
@@ -5172,7 +5173,7 @@ static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p)
5172 if (p->mm && printk_ratelimit()) 5173 if (p->mm && printk_ratelimit())
5173 printk(KERN_INFO "process %d (%s) no " 5174 printk(KERN_INFO "process %d (%s) no "
5174 "longer affine to cpu%d\n", 5175 "longer affine to cpu%d\n",
5175 p->pid, p->comm, dead_cpu); 5176 task_pid_nr(p), p->comm, dead_cpu);
5176 } 5177 }
5177 } while (!__migrate_task_irq(p, dead_cpu, dest_cpu)); 5178 } while (!__migrate_task_irq(p, dead_cpu, dest_cpu));
5178} 5179}