 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread.c,v 1.128 2012/03/08 16:40:45 joerg Exp $	*/
+/*	$NetBSD: pthread.c,v 1.129 2012/03/09 12:06:44 drochner Exp $	*/
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nathan J. Williams and 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION OR CONTRIBUTORS
  * 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>
-__RCSID("$NetBSD: pthread.c,v 1.128 2012/03/08 16:40:45 joerg Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.129 2012/03/09 12:06:44 drochner Exp $");
 #define	__EXPOSE_STACK	1
 #include <sys/param.h>
 #include <sys/exec_elf.h>
 #include <sys/mman.h>
 #include <sys/sysctl.h>
 #include <sys/lwpctl.h>
 #include <sys/tls.h>
 #include <assert.h>
 #include <dlfcn.h>
 #include <err.h>
 @@ -330,27 +330,27 @@ pthread__newstack(pthread_t newthread, c
 		stacksize = 0;
+	}
 	if (stacksize == 0)
 		stacksize = pthread__stacksize;
 	if (stackbase == NULL) {
 		stackbase = mmap(NULL, stacksize,
 		    PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, (off_t)0);
 		if (stackbase == MAP_FAILED)
 			return ENOMEM;
 		mapped_stack = true;
+	}
 	newthread->pt_stack.ss_size = pthread__stacksize - pthread__pagesize;
-		newthread->pt_stack.ss_sp = stackbase;
+	newthread->pt_stack.ss_sp = stackbase;
 #ifdef __MACHINE_STACK_GROWS_UP
 	redzone = (char *)stackbase + newthread->pt_stack.ss_size;
 #else
 	redzone = (char *)stackbase;
 #endif
 	if (mprotect(redzone, pthread__pagesize, PROT_NONE) == -1) {
 		if (mapped_stack)
 			munmap(stackbase, pthread__stacksize);
 		return EPERM;
+	}
 	return 0;
+}
 @@ -1250,27 +1250,27 @@ pthread__initmain(pthread_t *newt)
 	char *value;
 	pthread__initmainstack();
 	value = pthread__getenv("PTHREAD_STACKSIZE");
 	if (value != NULL) {
 		pthread__stacksize = atoi(value) * 1024;
 		if (pthread__stacksize > pthread__main.pt_stack.ss_size)
 			pthread__stacksize = pthread__main.pt_stack.ss_size;
+	}
 	if (pthread__stacksize == 0)
 		pthread__stacksize = pthread__main.pt_stack.ss_size;
 	pthread__stacksize += pthread__pagesize - 1;
-	pthread__stacksize &= ~pthread__pagesize;
+	pthread__stacksize &= ~(pthread__pagesize - 1);
 	if (pthread__stacksize < 4 * pthread__pagesize)
 		errx(1, "Stacksize limit is too low, minimum %zd kbyte.",
 * pthread__pagesize / 1024);
 	*newt = &pthread__main;
 #if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
 #  ifdef __HAVE___LWP_GETTCB_FAST
 	pthread__main.pt_tls = __lwp_gettcb_fast();
 #  else
 	pthread__main.pt_tls = _lwp_getprivate();
 #  endif
 	pthread__main.pt_tls->tcb_pthread = &pthread__main;
 #endif