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/sys.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/sys.c')
| -rw-r--r-- | kernel/sys.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 1b4c6df40..2ce90cc58 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -4,22 +4,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds */ -#include <linux/errno.h> -#include <linux/sched.h> -#include <linux/kernel.h> -#include <linux/times.h> +#include <linux/mm.h> #include <linux/utsname.h> -#include <linux/param.h> -#include <linux/resource.h> -#include <linux/signal.h> -#include <linux/string.h> -#include <linux/ptrace.h> -#include <linux/stat.h> #include <linux/mman.h> -#include <linux/mm.h> -#include <linux/fcntl.h> -#include <linux/tty.h> -#include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/notifier.h> #include <linux/reboot.h> @@ -586,11 +573,11 @@ asmlinkage int sys_setfsuid(uid_t uid) if (!issecure(SECURE_NO_SETUID_FIXUP)) { if (old_fsuid == 0 && current->fsuid != 0) { - current->cap_effective.cap &= ~CAP_FS_MASK; + cap_t(current->cap_effective) &= ~CAP_FS_MASK; } if (old_fsuid != 0 && current->fsuid == 0) { - current->cap_effective.cap |= - (current->cap_permitted.cap & CAP_FS_MASK); + cap_t(current->cap_effective) |= + (cap_t(current->cap_permitted) & CAP_FS_MASK); } } |