Module Name: src
Committed By: matt
Date: Thu Aug 19 07:30:32 UTC 2010
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: types.h
src/sys/uvm [matt-nb5-mips64]: uvm_map.c
Log Message:
Use __HAVE_CPU_VMSPACE_EXEC instead of a mips-specific #ifdef.
To generate a diff of this commit:
cvs rdiff -u -r1.43.36.15 -r1.43.36.16 src/sys/arch/mips/include/types.h
cvs rdiff -u -r1.263.4.3.4.2 -r1.263.4.3.4.3 src/sys/uvm/uvm_map.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/arch/mips/include/types.h
diff -u src/sys/arch/mips/include/types.h:1.43.36.15 src/sys/arch/mips/include/types.h:1.43.36.16
--- src/sys/arch/mips/include/types.h:1.43.36.15 Sun Feb 28 23:45:07 2010
+++ src/sys/arch/mips/include/types.h Thu Aug 19 07:30:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.43.36.15 2010/02/28 23:45:07 matt Exp $ */
+/* $NetBSD: types.h,v 1.43.36.16 2010/08/19 07:30:31 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -144,6 +144,9 @@
#if defined(_KERNEL)
#define __HAVE_RAS
+#if defined(_LP64)
+#define __HAVE_CPU_VMSPACE_EXEC
#endif
+#endif /* _KERNEL */
#endif /* _MACHTYPES_H_ */
Index: src/sys/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.263.4.3.4.2 src/sys/uvm/uvm_map.c:1.263.4.3.4.3
--- src/sys/uvm/uvm_map.c:1.263.4.3.4.2 Wed Aug 18 18:19:11 2010
+++ src/sys/uvm/uvm_map.c Thu Aug 19 07:30:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.263.4.3.4.2 2010/08/18 18:19:11 matt Exp $ */
+/* $NetBSD: uvm_map.c,v 1.263.4.3.4.3 2010/08/19 07:30:31 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.263.4.3.4.2 2010/08/18 18:19:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.263.4.3.4.3 2010/08/19 07:30:31 matt Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@@ -4139,7 +4139,7 @@
/* XXX cgd 960926: the sparc #ifdef should be a MD hook */
kill_user_windows(l); /* before stack addresses go away */
#endif
-#if defined(__mips__) && defined(_LP64)
+#ifdef __HAVE_CPU_VMSPACE_EXEC
cpu_vmspace_exec(l, start, end);
#endif
