diff options
author | Alex Elder <aelder@sgi.com> | 2010-08-02 10:24:57 -0500 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-08-02 10:24:57 -0500 |
commit | 6b0a2996a0c023d84bc27ec7528a6e54cb5ea264 (patch) | |
tree | 9fa9a85d5d871b3cb3c28daf57d8ef8f05becd66 /fs/proc/array.c | |
parent | 209fb87a259ead17e966627b7f053d16a96898da (diff) | |
parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) |
Merge branch 'v2.6.35'
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 9b58d38bc91..fff6572676a 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -176,7 +176,7 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, if (tracer) tpid = task_pid_nr_ns(tracer, ns); } - cred = get_cred((struct cred *) __task_cred(p)); + cred = get_task_cred(p); seq_printf(m, "State:\t%s\n" "Tgid:\t%d\n" |