diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-08 18:54:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-08 18:54:26 +0000 |
| commit | bccb225417c38461916eced0d24cfdfcdfb03f86 (patch) | |
| tree | b05526a9eb778e34c39c74fe2393d967af2b3336 /arch/s390 | |
| parent | 45fb4fc7edf6ae0b757491058f337c006823dae3 (diff) | |
| parent | bbba26b2fc88c77239ebcd45d7fb669018511dfe (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/compat_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index 8b6e4f5288a2..a98afed9348b 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c @@ -248,7 +248,7 @@ asmlinkage long sys32_setgroups16(int gidsetsize, u16 __user *grouplist) struct group_info *group_info; int retval; - if (!capable(CAP_SETGID)) + if (!may_setgroups()) return -EPERM; if ((unsigned)gidsetsize > NGROUPS_MAX) return -EINVAL; |