diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 11:31:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 11:31:55 -0700 |
| commit | 156a9ea43acb609ac89d48dbb9f0d05ee903a12e (patch) | |
| tree | 0b470e783c6f5012421a9a59aa8864c5fcc96407 /fs/proc | |
| parent | c8d10bffdbea5f82a8e491467a23fb2cc7da921b (diff) | |
| parent | ca05a99a54db1db5bca72eccb5866d2a86f8517f (diff) | |
| download | linux-156a9ea43acb609ac89d48dbb9f0d05ee903a12e.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6:
capabilities: remain source compatible with 32-bit raw legacy capability support.
LSM: remove stale web site from MAINTAINERS
Diffstat (limited to 'fs/proc')
| -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 9e3b8c33c24b..797d775e0354 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -288,7 +288,7 @@ static void render_cap_t(struct seq_file *m, const char *header, seq_printf(m, "%s", header); CAP_FOR_EACH_U32(__capi) { seq_printf(m, "%08x", - a->cap[(_LINUX_CAPABILITY_U32S-1) - __capi]); + a->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]); } seq_printf(m, "\n"); } |