diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-11-26 15:46:58 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-11-26 15:46:58 +0000 |
| commit | 77bc8c31dfc660f8542afa8a1ecc55f05486e75a (patch) | |
| tree | 26a56ae42f3e27681488fade1f57fd0e7205355d /usr/src/uts/common/sys | |
| parent | 3eb4dd4330b21c3bee973f4b117529f86d8794e0 (diff) | |
| parent | 0cc80ade12a7ed4a67d90f6496ecf40c87e8ff16 (diff) | |
| download | illumos-joyent-77bc8c31dfc660f8542afa8a1ecc55f05486e75a.tar.gz | |
[illumos-gate merge]
commit 0cc80ade12a7ed4a67d90f6496ecf40c87e8ff16
5335 psrset should support specifying a zone to bind
commit 89621fe174cf95ae903df6ceab605bf24d696ac3
5296 Support for more than 16 groups with AUTH_SYS
commit 64e4e50ab4bc3670a29e5691e3dd935c94f0a5d7
5341 gcore fails with "no such file or directory" if write fails ... error is misleading
Conflicts:
usr/src/cmd/mdb/common/modules/genunix/gcore.c
usr/src/cmd/mdb/common/mdb/mdb_err.c
usr/src/cmd/fs.d/nfs/mountd/mountd.c
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/param.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/sys/param.h b/usr/src/uts/common/sys/param.h index 657acc869e..12bdc29079 100644 --- a/usr/src/uts/common/sys/param.h +++ b/usr/src/uts/common/sys/param.h @@ -18,7 +18,9 @@ * * CDDL HEADER END */ + /* + * Copyright 2014 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -131,7 +133,6 @@ extern "C" { /* * NGROUPS_MAX_DEFAULT: *MUST* match NGROUPS_MAX value in limits.h. - * Remember that the NFS protocol must rev. before this can be increased */ #define NGROUPS_MAX_DEFAULT 16 |