Module Name: src
Committed By: dsl
Date: Wed Jan 2 19:39:04 UTC 2013
Modified Files:
src/sys/sys: lwp.h proc.h
src/usr.bin/kdump: kdump.c
Log Message:
Only expose the bulk of sys/proc.h and sys/lwp.h if _KERNEL or _KMEMUSER
is defined.
i386 and amd64 build ok.
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/sys/sys/lwp.h
cvs rdiff -u -r1.318 -r1.319 src/sys/sys/proc.h
cvs rdiff -u -r1.115 -r1.116 src/usr.bin/kdump/kdump.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/sys/lwp.h
diff -u src/sys/sys/lwp.h:1.166 src/sys/sys/lwp.h:1.167
--- src/sys/sys/lwp.h:1.166 Wed Dec 26 18:30:22 2012
+++ src/sys/sys/lwp.h Wed Jan 2 19:39:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lwp.h,v 1.166 2012/12/26 18:30:22 matt Exp $ */
+/* $NetBSD: lwp.h,v 1.167 2013/01/02 19:39:04 dsl Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010
@@ -33,6 +33,8 @@
#ifndef _SYS_LWP_H_
#define _SYS_LWP_H_
+#if defined(_KERNEL) || defined(_KMEMUSER)
+
#include <sys/param.h>
#include <sys/time.h>
#include <sys/queue.h>
@@ -67,7 +69,6 @@
* Fields are clustered together by usage (to increase the likelyhood
* of cache hits) and by size (to reduce dead space in the structure).
*/
-#if defined(_KERNEL) || defined(_KMEMUSER)
#include <sys/pcu.h>
@@ -196,7 +197,6 @@ struct lwp {
struct kdtrace_thread *l_dtrace; /* (: DTrace-specific data. */
};
-#endif /* _KERNEL || _KMEMUSER */
/*
* UAREA_PCB_OFFSET: an offset of PCB structure in the uarea. MD code may
@@ -220,6 +220,8 @@ extern int maxlwp __read_mostly; /* max
#endif
#endif
+#endif /* _KERNEL || _KMEMUSER */
+
/* These flags are kept in l_flag. */
#define LW_IDLE 0x00000001 /* Idle lwp. */
#define LW_LWPCTL 0x00000002 /* Adjust lwpctl in userret */
Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.318 src/sys/sys/proc.h:1.319
--- src/sys/sys/proc.h:1.318 Wed Dec 5 08:05:54 2012
+++ src/sys/sys/proc.h Wed Jan 2 19:39:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.318 2012/12/05 08:05:54 msaitoh Exp $ */
+/* $NetBSD: proc.h,v 1.319 2013/01/02 19:39:04 dsl Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,6 +68,10 @@
#ifndef _SYS_PROC_H_
#define _SYS_PROC_H_
+#include <sys/lwp.h>
+
+#if defined(_KMEMUSER) || defined(_KERNEL)
+
#if defined(_KERNEL_OPT)
#include "opt_multiprocessor.h"
#include "opt_kstack.h"
@@ -81,7 +85,6 @@
#include <sys/mqueue.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
-#include <sys/lwp.h>
#include <sys/queue.h>
#include <sys/signalvar.h>
#include <sys/siginfo.h>
@@ -324,6 +327,8 @@ struct proc {
#define p_session p_pgrp->pg_session
#define p_pgid p_pgrp->pg_id
+#endif /* _KMEMUSER || _KERNEL */
+
/*
* Status values.
*/
@@ -390,6 +395,8 @@ struct proc {
#define PL_SIGCOMPAT 0x00000200 /* Has used compat signal trampoline */
#define PL_ORPHANPG 0x20000000 /* Member of an orphaned pgrp */
+#if defined(_KMEMUSER) || defined(_KERNEL)
+
/*
* Macro to compute the exit signal to be delivered.
*/
@@ -538,8 +545,6 @@ extern struct emul emul_netbsd;
#endif /* _KERNEL */
-#if defined(_KMEMUSER) || defined(_KERNEL)
-
/*
* Kernel stack parameters.
*
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.115 src/usr.bin/kdump/kdump.c:1.116
--- src/usr.bin/kdump/kdump.c:1.115 Wed Sep 28 16:28:27 2011
+++ src/usr.bin/kdump/kdump.c Wed Jan 2 19:39:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.115 2011/09/28 16:28:27 christos Exp $ */
+/* $NetBSD: kdump.c,v 1.116 2013/01/02 19:39:04 dsl Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,16 +39,15 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kdump.c,v 1.115 2011/09/28 16:28:27 christos Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.116 2013/01/02 19:39:04 dsl Exp $");
#endif
#endif /* not lint */
#include <sys/param.h>
-#include <sys/proc.h> /* XXX #include <sys/file.h> fails without this header */
-#define _KERNEL
#include <sys/file.h>
+#define _KMEMUSER /* To get the pseudo errors defined */
#include <sys/errno.h>
-#undef _KERNEL
+#undef _KMEMUSER
#include <sys/time.h>
#include <sys/uio.h>
#include <sys/ktrace.h>
