diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-23 10:20:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-23 10:20:15 +0100 |
| commit | bfe2a3c3b5bf479788d5d5c5561346be6b169043 (patch) | |
| tree | 652c987279db7cd841d556f7bb1a589b57fbd6cc /kernel/sched.c | |
| parent | 77835492ed489c0b870f82f4c50687bd267acc0a (diff) | |
| parent | 35d266a24796f02f63299cfe5009dfc0d5a0e820 (diff) | |
| download | op-kernel-dev-bfe2a3c3b5bf479788d5d5c5561346be6b169043.zip op-kernel-dev-bfe2a3c3b5bf479788d5d5c5561346be6b169043.tar.gz | |
Merge branch 'core/percpu' into perfcounters/core
Conflicts:
arch/x86/include/asm/hardirq_32.h
arch/x86/include/asm/hardirq_64.h
Semantic merge:
arch/x86/include/asm/hardirq.h
[ added apic_perf_irqs field. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 40d70d9..8db1a4c 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -6009,12 +6009,7 @@ void sched_show_task(struct task_struct *p) printk(KERN_CONT " %016lx ", thread_saved_pc(p)); #endif #ifdef CONFIG_DEBUG_STACK_USAGE - { - unsigned long *n = end_of_stack(p); - while (!*n) - n++; - free = (unsigned long)n - (unsigned long)end_of_stack(p); - } + free = stack_not_used(p); #endif printk(KERN_CONT "%5lu %5d %6d\n", free, task_pid_nr(p), task_pid_nr(p->real_parent)); |
