From 61d4ec0c918cf7da2ea26d6c5fc7433f72aab361 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 13 Mar 2012 16:02:19 -0700
Subject: [PATCH] --- yaml --- r: 327261 b: refs/heads/master c:
 d20b92ab668cc44fc84bba0001839c5a8013a5cd h: refs/heads/master i:   327259:
 6b46ce7ef6dbd991ace7227e8a81b2e26c7d5d57 v: v3

---
 [refs]                     | 2 +-
 trunk/init/Kconfig         | 1 -
 trunk/kernel/trace/trace.c | 3 ++-
 trunk/kernel/trace/trace.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c22b4e9f6894..6bb9fc782cd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8f3d4de2d04e1a5b4293b67faee8ebabc64e9fa
+refs/heads/master: d20b92ab668cc44fc84bba0001839c5a8013a5cd
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 6de46ef12e3f..2a388e569a28 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -927,7 +927,6 @@ config UIDGID_CONVERTED
 	# Features
 	depends on IMA = n
 	depends on EVM = n
-	depends on TRACING = n
 	depends on FS_POSIX_ACL = n
 	depends on QUOTA = n
 	depends on QUOTACTL = n
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 5c38c81496ce..c9ace838d509 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -2060,7 +2060,8 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
 	seq_puts(m, "#    -----------------\n");
 	seq_printf(m, "#    | task: %.16s-%d "
 		   "(uid:%d nice:%ld policy:%ld rt_prio:%ld)\n",
-		   data->comm, data->pid, data->uid, data->nice,
+		   data->comm, data->pid,
+		   from_kuid_munged(seq_user_ns(m), data->uid), data->nice,
 		   data->policy, data->rt_priority);
 	seq_puts(m, "#    -----------------\n");
 
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
index 55e1f7f0db12..40a6f30c985f 100644
--- a/trunk/kernel/trace/trace.h
+++ b/trunk/kernel/trace/trace.h
@@ -147,7 +147,7 @@ struct trace_array_cpu {
 	unsigned long		skipped_entries;
 	cycle_t			preempt_timestamp;
 	pid_t			pid;
-	uid_t			uid;
+	kuid_t			uid;
 	char			comm[TASK_COMM_LEN];
 };