Module Name: src
Committed By: christos
Date: Sat Jan 25 19:44:11 UTC 2014
Modified Files:
src/sys/kern: exec_elf.c kern_exec.c kern_proc.c
Log Message:
__USING_TOPDOWN_VM is no more, __USE_TOPDOWN_VM...
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/kern/exec_elf.c
cvs rdiff -u -r1.369 -r1.370 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.190 -r1.191 src/sys/kern/kern_proc.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.53 src/sys/kern/exec_elf.c:1.54
--- src/sys/kern/exec_elf.c:1.53 Sat Dec 21 12:44:33 2013
+++ src/sys/kern/exec_elf.c Sat Jan 25 14:44:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.53 2013/12/21 17:44:33 skrll Exp $ */
+/* $NetBSD: exec_elf.c,v 1.54 2014/01/25 19:44:11 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.53 2013/12/21 17:44:33 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.54 2014/01/25 19:44:11 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -425,7 +425,7 @@ elf_load_file(struct lwp *l, struct exec
if (__predict_true(p->p_vmspace != proc0.p_vmspace)) {
use_topdown = p->p_vmspace->vm_map.flags & VM_MAP_TOPDOWN;
} else {
-#ifdef __USING_TOPDOWN_VM
+#ifdef __USE_TOPDOWN_VM
use_topdown = epp->ep_flags & EXEC_TOPDOWN_VM;
#else
use_topdown = false;
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.369 src/sys/kern/kern_exec.c:1.370
--- src/sys/kern/kern_exec.c:1.369 Fri Jan 3 10:49:49 2014
+++ src/sys/kern/kern_exec.c Sat Jan 25 14:44:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.369 2014/01/03 15:49:49 christos Exp $ */
+/* $NetBSD: kern_exec.c,v 1.370 2014/01/25 19:44:11 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.369 2014/01/03 15:49:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.370 2014/01/25 19:44:11 christos Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -113,7 +113,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_exec.c,
#include <compat/common/compat_util.h>
#ifndef MD_TOPDOWN_INIT
-#ifdef __USING_TOPDOWN_VM
+#ifdef __USE_TOPDOWN_VM
#define MD_TOPDOWN_INIT(epp) (epp)->ep_flags |= EXEC_TOPDOWN_VM
#else
#define MD_TOPDOWN_INIT(epp)
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.190 src/sys/kern/kern_proc.c:1.191
--- src/sys/kern/kern_proc.c:1.190 Thu Nov 14 07:07:11 2013
+++ src/sys/kern/kern_proc.c Sat Jan 25 14:44:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.190 2013/11/14 12:07:11 martin Exp $ */
+/* $NetBSD: kern_proc.c,v 1.191 2014/01/25 19:44:11 christos 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.190 2013/11/14 12:07:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.191 2014/01/25 19:44:11 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -484,7 +484,7 @@ proc0_init(void)
*/
uvmspace_init(&vmspace0, pmap_kernel(), round_page(VM_MIN_ADDRESS),
trunc_page(VM_MAX_ADDRESS),
-#ifdef __USING_TOPDOWN_VM
+#ifdef __USE_TOPDOWN_VM
true
#else
false
