Module Name: src
Committed By: rmind
Date: Thu Apr 16 00:17:19 UTC 2009
Modified Files:
src/sys/kern: kern_proc.c kern_synch.c
src/sys/sys: proc.h
src/sys/uvm: uvm_glue.c
Log Message:
Avoid few #ifdef KSTACK_CHECK_MAGIC.
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.262 -r1.263 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.284 -r1.285 src/sys/sys/proc.h
cvs rdiff -u -r1.136 -r1.137 src/sys/uvm/uvm_glue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.148 src/sys/kern/kern_proc.c:1.149
--- src/sys/kern/kern_proc.c:1.148 Sat Mar 28 21:41:05 2009
+++ src/sys/kern/kern_proc.c Thu Apr 16 00:17:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.148 2009/03/28 21:41:05 rmind Exp $ */
+/* $NetBSD: kern_proc.c,v 1.149 2009/04/16 00:17:19 rmind Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.148 2009/03/28 21:41:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.149 2009/04/16 00:17:19 rmind Exp $");
#include "opt_kstack.h"
#include "opt_maxuprc.h"
@@ -1067,9 +1067,8 @@
#define KSTACK_MAGIC 0xdeadbeaf
/* XXX should be per process basis? */
-int kstackleftmin = KSTACK_SIZE;
-int kstackleftthres = KSTACK_SIZE / 8; /* warn if remaining stack is
- less than this */
+static int kstackleftmin = KSTACK_SIZE;
+static int kstackleftthres = KSTACK_SIZE / 8;
void
kstack_setup_magic(const struct lwp *l)
Index: src/sys/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.262 src/sys/kern/kern_synch.c:1.263
--- src/sys/kern/kern_synch.c:1.262 Wed Apr 15 11:44:20 2009
+++ src/sys/kern/kern_synch.c Thu Apr 16 00:17:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.262 2009/04/15 11:44:20 yamt Exp $ */
+/* $NetBSD: kern_synch.c,v 1.263 2009/04/16 00:17:19 rmind Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.262 2009/04/15 11:44:20 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.263 2009/04/16 00:17:19 rmind Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -583,9 +583,7 @@
KASSERT(kpreempt_disabled());
LOCKDEBUG_BARRIER(l->l_mutex, 1);
-#ifdef KSTACK_CHECK_MAGIC
kstack_check_magic(l);
-#endif
binuptime(&bt);
@@ -828,9 +826,7 @@
KASSERT(ci == curcpu());
LOCKDEBUG_BARRIER(NULL, 0);
-#ifdef KSTACK_CHECK_MAGIC
kstack_check_magic(l);
-#endif
/* Count time spent in current system call */
SYSCALL_TIME_SLEEP(l);
Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.284 src/sys/sys/proc.h:1.285
--- src/sys/sys/proc.h:1.284 Sat Mar 28 21:41:06 2009
+++ src/sys/sys/proc.h Thu Apr 16 00:17:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.284 2009/03/28 21:41:06 rmind Exp $ */
+/* $NetBSD: proc.h,v 1.285 2009/04/16 00:17:19 rmind Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -565,6 +565,9 @@
#ifdef KSTACK_CHECK_MAGIC
void kstack_setup_magic(const struct lwp *);
void kstack_check_magic(const struct lwp *);
+#else
+#define kstack_setup_magic(x)
+#define kstack_check_magic(x)
#endif
/*
Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.136 src/sys/uvm/uvm_glue.c:1.137
--- src/sys/uvm/uvm_glue.c:1.136 Sun Mar 29 01:02:51 2009
+++ src/sys/uvm/uvm_glue.c Thu Apr 16 00:17:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_glue.c,v 1.136 2009/03/29 01:02:51 mrg Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.137 2009/04/16 00:17:19 rmind Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.136 2009/03/29 01:02:51 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.137 2009/04/16 00:17:19 rmind Exp $");
#include "opt_kgdb.h"
#include "opt_kstack.h"
@@ -253,12 +253,8 @@
l2->l_flag |= LW_INMEM;
}
-#ifdef KSTACK_CHECK_MAGIC
- /*
- * fill stack with magic number
- */
+ /* Fill stack with magic number. */
kstack_setup_magic(l2);
-#endif
/*
* cpu_lwp_fork() copy and update the pcb, and make the child ready
