summaryrefslogtreecommitdiffstats
path: root/fs/proc/array.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-16 23:13:42 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-16 23:13:42 +1000
commitfcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch)
treea99c0e14daaf31cb078812fb2fbc6abadfcd738f /fs/proc/array.c
parent541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff)
parentf26a3988917913b3d11b2bd741601a2c64ab9204 (diff)
downloadkernel-crypto-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.gz
kernel-crypto-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.xz
kernel-crypto-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.zip
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r--fs/proc/array.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index dca997a93bf..9e3b8c33c24 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -298,6 +298,7 @@ static inline void task_cap(struct seq_file *m, struct task_struct *p)
render_cap_t(m, "CapInh:\t", &p->cap_inheritable);
render_cap_t(m, "CapPrm:\t", &p->cap_permitted);
render_cap_t(m, "CapEff:\t", &p->cap_effective);
+ render_cap_t(m, "CapBnd:\t", &p->cap_bset);
}
static inline void task_context_switch_counts(struct seq_file *m,