Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern migrate compat32 handling with previous



details:   https://anonhg.NetBSD.org/src/rev/45a3b2b5cebf
branches:  trunk
changeset: 761469:45a3b2b5cebf
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jan 28 20:31:10 2011 +0000

description:
migrate compat32 handling with previous

pointed out by Lars Heidieker

diffstat:

 sys/kern/init_sysctl.c |  8 ++------
 sys/kern/kern_proc.c   |  9 +++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r 22247049ad19 -r 45a3b2b5cebf sys/kern/init_sysctl.c
--- a/sys/kern/init_sysctl.c    Fri Jan 28 20:23:38 2011 +0000
+++ b/sys/kern/init_sysctl.c    Fri Jan 28 20:31:10 2011 +0000
@@ -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
diff -r 22247049ad19 -r 45a3b2b5cebf sys/kern/kern_proc.c
--- a/sys/kern/kern_proc.c      Fri Jan 28 20:23:38 2011 +0000
+++ b/sys/kern/kern_proc.c      Fri Jan 28 20:31:10 2011 +0000
@@ -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
  */



Home | Main Index | Thread Index | Old Index