diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-19 12:36:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-19 12:36:09 +0100 |
| commit | 7890ba8c87604ca4c2c73f7de846bf5305d743e4 (patch) | |
| tree | f3f920c09b8de694b1bc1d4b878cfd2b0b98c913 /kernel/sched.c | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd (diff) | |
| parent | b2b062b8163391c42b3219d466ca1ac9742b9c7b (diff) | |
Merge branch 'stackprotector' into core/percpu
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 8be2c13b50d..1d290906704 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -5939,12 +5939,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)); |