6294710 rctladm incorrectly claims and reports it can log to syslog for project.cpu-shares

3 files changed, 12 insertions, 12 deletions

diff --git a/usr/src/uts/common/os/project.c b/usr/src/uts/common/os/project.c
index 177f9a5d21..ddf0139d2b 100644
--- a/usr/src/uts/common/os/project.c
+++ b/usr/src/uts/common/os/project.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -733,7 +732,8 @@ project_init(void)
 	rc_project_cpu_shares = rctl_register("project.cpu-shares",
 	    RCENTITY_PROJECT, RCTL_GLOBAL_SIGNAL_NEVER |
 	    RCTL_GLOBAL_DENY_NEVER | RCTL_GLOBAL_NOBASIC |
-	    RCTL_GLOBAL_COUNT, FSS_MAXSHARES, FSS_MAXSHARES,
+	    RCTL_GLOBAL_COUNT | RCTL_GLOBAL_SYSLOG_NEVER,
+	    FSS_MAXSHARES, FSS_MAXSHARES,
 	    &project_cpu_shares_ops);
 	rctl_add_default_limit("project.cpu-shares", 1, RCPRIV_PRIVILEGED,
 	    RCTL_LOCAL_NOACTION);
diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c
index 4a1845f72f..45f2b6e5ab 100644
--- a/usr/src/uts/common/os/zone.c
+++ b/usr/src/uts/common/os/zone.c
@@ -1069,8 +1069,8 @@ zone_init(void)
 	 */
 	rc_zone_cpu_shares = rctl_register("zone.cpu-shares",
 	    RCENTITY_ZONE, RCTL_GLOBAL_SIGNAL_NEVER | RCTL_GLOBAL_DENY_NEVER |
-	    RCTL_GLOBAL_NOBASIC |
-	    RCTL_GLOBAL_COUNT, FSS_MAXSHARES, FSS_MAXSHARES,
+	    RCTL_GLOBAL_NOBASIC | RCTL_GLOBAL_COUNT | RCTL_GLOBAL_SYSLOG_NEVER,
+	    FSS_MAXSHARES, FSS_MAXSHARES,
 	    &zone_cpu_shares_ops);
 
 	rc_zone_nlwps = rctl_register("zone.max-lwps", RCENTITY_ZONE,
diff --git a/usr/src/uts/common/sys/rctl.h b/usr/src/uts/common/sys/rctl.h
index d67edb2d99..02bcef6f36 100644
--- a/usr/src/uts/common/sys/rctl.h
+++ b/usr/src/uts/common/sys/rctl.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -65,13 +64,14 @@ extern "C" {
 #define	RCTL_GLOBAL_NOLOCALACTION	RCTL_GLOBAL_SIGNAL_NEVER
 #define	RCTL_GLOBAL_INFINITE		0x01000000
 #define	RCTL_GLOBAL_UNOBSERVABLE	0x00800000
+#define	RCTL_GLOBAL_SYSLOG_NEVER	0x00080000
 
 #define	RCTL_GLOBAL_BYTES		0x00400000
 #define	RCTL_GLOBAL_SECONDS		0x00200000
 #define	RCTL_GLOBAL_COUNT		0x00100000
 
 #define	RCTL_GLOBAL_ACTION_MASK		0xffff0000
-#define	RCTL_GLOBAL_MASK		0xff700001
+#define	RCTL_GLOBAL_MASK		0xfff80001
 
 /*
  * getrctl(2) flag values