X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..4452a7af2eac33dbad800bcc91f2399d62c18f53:/bsd/kern/sysv_shm.c

diff --git a/bsd/kern/sysv_shm.c b/bsd/kern/sysv_shm.c
index 2680258a9..37822b44e 100644
--- a/bsd/kern/sysv_shm.c
+++ b/bsd/kern/sysv_shm.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
@@ -837,12 +835,10 @@ sysv_shm_lock_init( void )
 {
 
 	sysv_shm_subsys_lck_grp_attr = lck_grp_attr_alloc_init();
-	lck_grp_attr_setstat(sysv_shm_subsys_lck_grp_attr);
 	
 	sysv_shm_subsys_lck_grp = lck_grp_alloc_init("sysv_shm_subsys_lock", sysv_shm_subsys_lck_grp_attr);
 	
 	sysv_shm_subsys_lck_attr = lck_attr_alloc_init();
-	/* lck_attr_setdebug(sysv_shm_subsys_lck_attr); */
 	lck_mtx_init(&sysv_shm_subsys_mutex, sysv_shm_subsys_lck_grp, sysv_shm_subsys_lck_attr);
 }
 
@@ -855,14 +851,14 @@ sysctl_shminfo(__unused struct sysctl_oid *oidp, void *arg1,
 	int error = 0;
 	int sysctl_shminfo_ret = 0;
 
-	error = SYSCTL_OUT(req, arg1, sizeof(user_ssize_t));
+	error = SYSCTL_OUT(req, arg1, sizeof(int64_t));
 	if (error || req->newptr == USER_ADDR_NULL)
 		return(error);
 
 	SYSV_SHM_SUBSYS_LOCK();
 	/* Set the values only if shared memory is not initialised */
 	if (!shm_inited) {
-		if ((error = SYSCTL_IN(req, arg1, sizeof(user_ssize_t))) 
+		if ((error = SYSCTL_IN(req, arg1, sizeof(int64_t))) 
 		    != 0) {
 			sysctl_shminfo_ret = error;
 			goto sysctl_shminfo_out;
@@ -870,18 +866,18 @@ sysctl_shminfo(__unused struct sysctl_oid *oidp, void *arg1,
 
 		if (arg1 == &shminfo.shmmax) {
 			if (shminfo.shmmax & PAGE_MASK_64) {
-				shminfo.shmmax = (user_ssize_t)-1;
+				shminfo.shmmax = (int64_t)-1;
 				sysctl_shminfo_ret = EINVAL;
 				goto sysctl_shminfo_out;
 			}
 		}
 
 		/* Initialize only when all values are set */
-		if ((shminfo.shmmax != (user_ssize_t)-1) &&
-			(shminfo.shmmin != (user_ssize_t)-1) &&	
-			(shminfo.shmmni != (user_ssize_t)-1) &&
-			(shminfo.shmseg != (user_ssize_t)-1) &&
-			(shminfo.shmall != (user_ssize_t)-1)) {
+		if ((shminfo.shmmax != (int64_t)-1) &&
+			(shminfo.shmmin != (int64_t)-1) &&	
+			(shminfo.shmmni != (int64_t)-1) &&
+			(shminfo.shmseg != (int64_t)-1) &&
+			(shminfo.shmall != (int64_t)-1)) {
 				shminit(NULL);
 		}
 	}