 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysv_msg.c,v 1.61 2009/01/28 00:59:03 njoly Exp $	*/
+/*	$NetBSD: sysv_msg.c,v 1.62 2011/07/30 06:19:02 uebayasi Exp $	*/
 /*-
  * Copyright (c) 1999, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -40,27 +40,27 @@
  * This system call was implemented by Daniel Boulet under contract from RTMX.
+ *
  * Redistribution and use in source forms, with and without modification,
  * are permitted provided that this entire comment appears intact.
+ *
  * Redistribution in binary form may occur without any restrictions.
  * Obviously, it would be nice if you gave credit where credit is due
  * but requiring it would be too onerous.
+ *
  * This software is provided ``AS IS'' without any warranties of any kind.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_msg.c,v 1.61 2009/01/28 00:59:03 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_msg.c,v 1.62 2011/07/30 06:19:02 uebayasi Exp $");
 #define SYSVMSG
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/msg.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>		/* XXX for <sys/syscallargs.h> */
 #include <sys/syscallargs.h>
 #include <sys/kauth.h>
 #define MSG_DEBUG
 #undef MSG_DEBUG_OK
 @@ -106,28 +106,28 @@ msginit(void)
 		panic("msginfo.msgssz = %d, not a small power of 2",
 		    msginfo.msgssz);
+	}
 	if (msginfo.msgseg > 32767) {
 		panic("msginfo.msgseg = %d > 32767", msginfo.msgseg);
+	}
 	/* Allocate the wired memory for our structures */
 	sz = ALIGN(msginfo.msgmax) +
 	    ALIGN(msginfo.msgseg * sizeof(struct msgmap)) +
 	    ALIGN(msginfo.msgtql * sizeof(struct __msg)) +
 	    ALIGN(msginfo.msgmni * sizeof(kmsq_t));
-	v = uvm_km_alloc(kernel_map, round_page(sz), 0,
+	sz = round_page(sz);
-	    UVM_KMF_WIRED|UVM_KMF_ZERO);
+	v = uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
 	if (v == 0)
 		panic("sysv_msg: cannot allocate memory");
 	msgpool = (void *)v;
 	msgmaps = (void *)((uintptr_t)msgpool + ALIGN(msginfo.msgmax));
 	msghdrs = (void *)((uintptr_t)msgmaps +
 	    ALIGN(msginfo.msgseg * sizeof(struct msgmap)));
 	msqs = (void *)((uintptr_t)msghdrs +
 	    ALIGN(msginfo.msgtql * sizeof(struct __msg)));
 	for (i = 0; i < (msginfo.msgseg - 1); i++)
 		msgmaps[i].next = i + 1;
 	msgmaps[msginfo.msgseg - 1].next = -1;
 @@ -166,28 +166,28 @@ msgrealloc(int newmsgmni, int newmsgseg)
 	vaddr_t v;
 	int i, sz, msqid, newmsgmax, new_nfree_msgmaps;
 	short new_free_msgmaps;
 	if (newmsgmni < 1 || newmsgseg < 1)
 		return EINVAL;
 	/* Allocate the wired memory for our structures */
 	newmsgmax = msginfo.msgssz * newmsgseg;
 	sz = ALIGN(newmsgmax) +
 	    ALIGN(newmsgseg * sizeof(struct msgmap)) +
 	    ALIGN(msginfo.msgtql * sizeof(struct __msg)) +
 	    ALIGN(newmsgmni * sizeof(kmsq_t));
-	v = uvm_km_alloc(kernel_map, round_page(sz), 0,
+	sz = round_page(sz);
-	    UVM_KMF_WIRED|UVM_KMF_ZERO);
+	v = uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
 	if (v == 0)
 		return ENOMEM;
 	mutex_enter(&msgmutex);
 	if (msg_realloc_state) {
 		mutex_exit(&msgmutex);
 		uvm_km_free(kernel_map, v, sz, UVM_KMF_WIRED);
 		return EBUSY;
+	}
 	msg_realloc_state = true;
 	if (msg_waiters) {
 		/*
 		 * Mark reallocation state, wake-up all waiters,
 @@ -329,26 +329,27 @@ msgrealloc(int newmsgmni, int newmsgseg)
 			/* Next message header */
 			msghdr = msghdr->msg_next;
+		}
 		nmptr->_msg_last = nmsghdr;
+	}
 	KASSERT((msginfo.msgseg - nfree_msgmaps) ==
 	    (newmsgseg - new_nfree_msgmaps));
 	sz = ALIGN(msginfo.msgmax) +
 	    ALIGN(msginfo.msgseg * sizeof(struct msgmap)) +
 	    ALIGN(msginfo.msgtql * sizeof(struct __msg)) +
 	    ALIGN(msginfo.msgmni * sizeof(kmsq_t));
 	sz = round_page(sz);
 	for (i = 0; i < msginfo.msgmni; i++)
 		cv_destroy(&msqs[i].msq_cv);
 	/* Set the pointers and update the new values */
 	msgpool = new_msgpool;
 	msgmaps = new_msgmaps;
 	msghdrs = new_msghdrs;
 	msqs = new_msqs;
 	free_msghdrs = new_free_msghdrs;
 	free_msgmaps = new_free_msgmaps;
 	nfree_msgmaps = new_nfree_msgmaps;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysv_sem.c,v 1.87 2011/05/13 22:16:44 rmind Exp $	*/
+/*	$NetBSD: sysv_sem.c,v 1.88 2011/07/30 06:19:02 uebayasi Exp $	*/
 /*-
  * Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -29,27 +29,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Implementation of SVID semaphores
+ *
  * Author: Daniel Boulet
+ *
  * This software is provided ``AS IS'' without any warranties of any kind.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_sem.c,v 1.87 2011/05/13 22:16:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_sem.c,v 1.88 2011/07/30 06:19:02 uebayasi Exp $");
 #define SYSVSEM
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/sem.h>
 #include <sys/sysctl.h>
 #include <sys/kmem.h>
 #include <sys/mount.h>		/* XXX for <sys/syscallargs.h> */
 #include <sys/syscallargs.h>
 #include <sys/kauth.h>
 /*
 @@ -96,28 +96,28 @@ seminit(void)
 	vaddr_t v;
 	mutex_init(&semlock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&sem_realloc_cv, "semrealc");
 	sem_realloc_state = false;
 	semtot = 0;
 	sem_waiters = 0;
 	/* Allocate the wired memory for our structures */
 	sz = ALIGN(seminfo.semmni * sizeof(struct semid_ds)) +
 	    ALIGN(seminfo.semmns * sizeof(struct __sem)) +
 	    ALIGN(seminfo.semmni * sizeof(kcondvar_t)) +
 	    ALIGN(seminfo.semmnu * seminfo.semusz);
-	v = uvm_km_alloc(kernel_map, round_page(sz), 0,
+	sz = round_page(sz);
-	    UVM_KMF_WIRED|UVM_KMF_ZERO);
+	v = uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
 	if (v == 0)
 		panic("sysv_sem: cannot allocate memory");
 	sema = (void *)v;
 	sem = (void *)((uintptr_t)sema +
 	    ALIGN(seminfo.semmni * sizeof(struct semid_ds)));
 	semcv = (void *)((uintptr_t)sem +
 	    ALIGN(seminfo.semmns * sizeof(struct __sem)));
 	semu = (void *)((uintptr_t)semcv +
 	    ALIGN(seminfo.semmni * sizeof(kcondvar_t)));
 	for (i = 0; i < seminfo.semmni; i++) {
 		sema[i]._sem_base = 0;
 		sema[i].sem_perm.mode = 0;
 @@ -140,28 +140,28 @@ semrealloc(int newsemmni, int newsemmns,
 	int *new_semu;
 	kcondvar_t *new_semcv;
 	vaddr_t v;
 	int i, j, lsemid, nmnus, sz;
 	if (newsemmni < 1 || newsemmns < 1 || newsemmnu < 1)
 		return EINVAL;
 	/* Allocate the wired memory for our structures */
 	sz = ALIGN(newsemmni * sizeof(struct semid_ds)) +
 	    ALIGN(newsemmns * sizeof(struct __sem)) +
 	    ALIGN(newsemmni * sizeof(kcondvar_t)) +
 	    ALIGN(newsemmnu * seminfo.semusz);
-	v = uvm_km_alloc(kernel_map, round_page(sz), 0,
+	sz = round_page(sz);
-	    UVM_KMF_WIRED|UVM_KMF_ZERO);
+	v = uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
 	if (v == 0)
 		return ENOMEM;
 	mutex_enter(&semlock);
 	if (sem_realloc_state) {
 		mutex_exit(&semlock);
 		uvm_km_free(kernel_map, v, sz, UVM_KMF_WIRED);
 		return EBUSY;
+	}
 	sem_realloc_state = true;
 	if (sem_waiters) {
 		/*
 		 * Mark reallocation state, wake-up all waiters,
 @@ -241,26 +241,27 @@ semrealloc(int newsemmni, int newsemmns,
 		new_semu_list = nsuptr;
 		j++;
+	}
 	for (i = 0; i < seminfo.semmni; i++) {
 		KASSERT(cv_has_waiters(&semcv[i]) == false);
 		cv_destroy(&semcv[i]);
+	}
 	sz = ALIGN(seminfo.semmni * sizeof(struct semid_ds)) +
 	    ALIGN(seminfo.semmns * sizeof(struct __sem)) +
 	    ALIGN(seminfo.semmni * sizeof(kcondvar_t)) +
 	    ALIGN(seminfo.semmnu * seminfo.semusz);
 	sz = round_page(sz);
 	/* Set the pointers and update the new values */
 	sema = new_sema;
 	sem = new_sem;
 	semcv = new_semcv;
 	semu = new_semu;
 	semu_list = new_semu_list;
 	seminfo.semmni = newsemmni;
 	seminfo.semmns = newsemmns;
 	seminfo.semmnu = newsemmnu;
 	/* Reallocation completed - notify all waiters, if any */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysv_shm.c,v 1.120 2011/06/12 03:35:56 rmind Exp $	*/
+/*	$NetBSD: sysv_shm.c,v 1.121 2011/07/30 06:19:02 uebayasi Exp $	*/
 /*-
  * Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -51,27 +51,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.120 2011/06/12 03:35:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.121 2011/07/30 06:19:02 uebayasi Exp $");
 #define SYSVSHM
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/shm.h>
 #include <sys/mutex.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>		/* XXX for <sys/syscallargs.h> */
 #include <sys/syscallargs.h>
 @@ -867,28 +867,28 @@ shmrealloc(int newshmni)
+{
 	vaddr_t v;
 	struct shmid_ds *oldshmsegs, *newshmsegs;
 	kcondvar_t *newshm_cv, *oldshm_cv;
 	size_t sz;
 	int i, lsegid, oldshmni;
 	if (newshmni < 1)
 		return EINVAL;
 	/* Allocate new memory area */
 	sz = ALIGN(newshmni * sizeof(struct shmid_ds)) +
 	    ALIGN(newshmni * sizeof(kcondvar_t));
-	v = uvm_km_alloc(kernel_map, round_page(sz), 0,
+	sz = round_page(sz);
-	    UVM_KMF_WIRED|UVM_KMF_ZERO);
+	v = uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
 	if (v == 0)
 		return ENOMEM;
 	mutex_enter(&shm_lock);
 	while (shm_realloc_state || shm_realloc_disable)
 		cv_wait(&shm_realloc_cv, &shm_lock);
 	/*
 	 * Get the number of last segment.  Fail we are trying to
 	 * reallocate less memory than we use.
 	 */
 	lsegid = 0;
 	for (i = 0; i < shminfo.shmmni; i++)
 @@ -926,46 +926,47 @@ shmrealloc(int newshmni)
 	/* Reallocation completed - notify all waiters, if any */
 	shm_realloc_state = false;
 	cv_broadcast(&shm_realloc_cv);
 	mutex_exit(&shm_lock);
 	/* Release now unused resources. */
 	oldshm_cv = (void *)((uintptr_t)oldshmsegs +
 	    ALIGN(oldshmni * sizeof(struct shmid_ds)));
 	for (i = 0; i < oldshmni; i++)
 		cv_destroy(&oldshm_cv[i]);
 	sz = ALIGN(oldshmni * sizeof(struct shmid_ds)) +
 	    ALIGN(oldshmni * sizeof(kcondvar_t));
 	sz = round_page(sz);
 	uvm_km_free(kernel_map, (vaddr_t)oldshmsegs, sz, UVM_KMF_WIRED);
 	return 0;
+}
 void
 shminit(void)
+{
 	vaddr_t v;
 	size_t sz;
 	int i;
 	mutex_init(&shm_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&shm_realloc_cv, "shmrealc");
 	/* Allocate the wired memory for our structures */
 	sz = ALIGN(shminfo.shmmni * sizeof(struct shmid_ds)) +
 	    ALIGN(shminfo.shmmni * sizeof(kcondvar_t));
-	v = uvm_km_alloc(kernel_map, round_page(sz), 0,
+	sz = round_page(sz);
-	    UVM_KMF_WIRED|UVM_KMF_ZERO);
+	v = uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
 	if (v == 0)
 		panic("sysv_shm: cannot allocate memory");
 	shmsegs = (void *)v;
 	shm_cv = (void *)((uintptr_t)shmsegs +
 	    ALIGN(shminfo.shmmni * sizeof(struct shmid_ds)));
 	if (shminfo.shmmax == 0)
 		shminfo.shmmax = max(physmem / 4, 1024) * PAGE_SIZE;
 	else
 		shminfo.shmmax *= PAGE_SIZE;
 	shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
 	for (i = 0; i < shminfo.shmmni; i++) {