diff --git a/[refs] b/[refs] index 0030a60b6a8f..10d89fd8da0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60aa605dfce2976e54fa76e805ab0f221372d4d9 +refs/heads/master: aa47b7e0f89b9998dad4d1667447e8cb7703ff4e diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 2a43a581ead3..5aa63f50c696 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6610,8 +6610,9 @@ void sched_show_task(struct task_struct *p) #ifdef CONFIG_DEBUG_STACK_USAGE free = stack_not_used(p); #endif - printk(KERN_CONT "%5lu %5d %6d\n", free, - task_pid_nr(p), task_pid_nr(p->real_parent)); + printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free, + task_pid_nr(p), task_pid_nr(p->real_parent), + (unsigned long)task_thread_info(p)->flags); show_stack(p, NULL); }