Module Name: src
Committed By: pooka
Date: Fri Jan 28 20:31:10 UTC 2011
Modified Files:
src/sys/kern: init_sysctl.c kern_proc.c
Log Message:
migrate compat32 handling with previous
pointed out by Lars Heidieker
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.170 -r1.171 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/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.177 src/sys/kern/init_sysctl.c:1.178
--- src/sys/kern/init_sysctl.c:1.177 Fri Jan 28 18:44:44 2011
+++ src/sys/kern/init_sysctl.c Fri Jan 28 20:31:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.177 2011/01/28 18:44:44 pooka Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.178 2011/01/28 20:31:10 pooka Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,10 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.177 2011/01/28 18:44:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.178 2011/01/28 20:31:10 pooka Exp $");
#include "opt_sysv.h"
-#include "opt_compat_netbsd32.h"
#include "opt_compat_netbsd.h"
#include "opt_modular.h"
#include "opt_sa.h"
@@ -71,9 +70,6 @@
#include <sys/ktrace.h>
#include <sys/ksem.h>
-#ifdef COMPAT_NETBSD32
-#include <compat/netbsd32/netbsd32.h>
-#endif
#ifdef COMPAT_50
#include <compat/sys/time.h>
#endif
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.170 src/sys/kern/kern_proc.c:1.171
--- src/sys/kern/kern_proc.c:1.170 Fri Jan 28 18:44:44 2011
+++ src/sys/kern/kern_proc.c Fri Jan 28 20:31:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.170 2011/01/28 18:44:44 pooka Exp $ */
+/* $NetBSD: kern_proc.c,v 1.171 2011/01/28 20:31:10 pooka Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,12 +62,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.170 2011/01/28 18:44:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.171 2011/01/28 20:31:10 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
#include "opt_maxuprc.h"
#include "opt_dtrace.h"
+#include "opt_compat_netbsd32.h"
#endif
#include <sys/param.h>
@@ -104,6 +105,10 @@
#include <uvm/uvm_extern.h>
#include <uvm/uvm_extern.h>
+#ifdef COMPAT_NETBSD32
+#include <compat/netbsd32/netbsd32.h>
+#endif
+
/*
* Other process lists
*/
