From 10ce076ce2dac0224fa723db6dbcaa7d306a8134 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Mon, 4 May 2009 01:38:05 -0700
Subject: [PATCH] --- yaml --- r: 145711 b: refs/heads/master c:
 aa47b7e0f89b9998dad4d1667447e8cb7703ff4e h: refs/heads/master i:   145709:
 8b1ac9a0baa131289f44bf473878a0248d58c6b3   145707:
 5a378f0d3d6efcccea7971fb5d4cc583fecfd71c   145703:
 adc6ccc4c7b295c0c36967b0522ee842c328ce81   145695:
 e41295569e3c4257fa9c71edcb2acbf93d7970b1 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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);
 }