diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /kernel/capability.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'kernel/capability.c')
| -rw-r--r-- | kernel/capability.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index b2a8d43a1..a4a1a3d03 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -5,13 +5,7 @@ * Integrated into 2.1.97+, Andrew G. Morgan <morgan@transmeta.com> */ -#include <linux/errno.h> -#include <linux/kernel.h> -#include <linux/capability.h> #include <linux/mm.h> -#include <linux/sched.h> -#include <linux/string.h> - #include <asm/uaccess.h> /* Note: never hold tasklist_lock while spinning for this one */ @@ -61,9 +55,9 @@ asmlinkage int sys_capget(cap_user_header_t header, cap_user_data_t dataptr) } if (!error) { - data.permitted = target->cap_permitted.cap; - data.inheritable = target->cap_inheritable.cap; - data.effective = target->cap_effective.cap; + data.permitted = cap_t(target->cap_permitted); + data.inheritable = cap_t(target->cap_inheritable); + data.effective = cap_t(target->cap_effective); } if (target != current) |