diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /kernel/capability.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'kernel/capability.c')
| -rw-r--r-- | kernel/capability.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index a4a1a3d03..2dbfe83f7 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -17,7 +17,9 @@ spinlock_t task_capability_lock; * uninteresting and/or not to be changed. */ -asmlinkage int sys_capget(cap_user_header_t header, cap_user_data_t dataptr) +kernel_cap_t cap_bset = CAP_FULL_SET; + +asmlinkage long sys_capget(cap_user_header_t header, cap_user_data_t dataptr) { int error, pid; __u32 version; @@ -124,7 +126,7 @@ static void cap_set_all(kernel_cap_t *effective, * E: must be set to a subset of (new target) Permitted */ -asmlinkage int sys_capset(cap_user_header_t header, const cap_user_data_t data) +asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data) { kernel_cap_t inheritable, permitted, effective; __u32 version; |