Module Name: src
Committed By: rmind
Date: Mon May 2 02:28:58 UTC 2011
Modified Files:
src/sys/sys: lwp.h pcu.h
Log Message:
Limit sys/pcu.h inclusion within _KERNEL scope, plus _KMEMUSER.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/sys/lwp.h
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/pcu.h
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.150 src/sys/sys/lwp.h:1.151
--- src/sys/sys/lwp.h:1.150 Tue Mar 8 12:39:29 2011
+++ src/sys/sys/lwp.h Mon May 2 02:28:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lwp.h,v 1.150 2011/03/08 12:39:29 pooka Exp $ */
+/* $NetBSD: lwp.h,v 1.151 2011/05/02 02:28:57 rmind Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010
@@ -44,7 +44,6 @@
#include <sys/specificdata.h>
#include <sys/syncobj.h>
#include <sys/resource.h>
-#include <sys/pcu.h>
#if defined(_KERNEL)
#include <machine/cpu.h> /* curcpu() and cpu_info */
@@ -68,6 +67,9 @@
* of cache hits) and by size (to reduce dead space in the structure).
*/
#if defined(_KERNEL) || defined(_KMEMUSER)
+
+#include <sys/pcu.h>
+
struct lockdebug;
struct sadata_vp;
struct sysent;
Index: src/sys/sys/pcu.h
diff -u src/sys/sys/pcu.h:1.5 src/sys/sys/pcu.h:1.6
--- src/sys/sys/pcu.h:1.5 Mon May 2 00:29:53 2011
+++ src/sys/sys/pcu.h Mon May 2 02:28:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcu.h,v 1.5 2011/05/02 00:29:53 rmind Exp $ */
+/* $NetBSD: pcu.h,v 1.6 2011/05/02 02:28:57 rmind Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _SYS_PCU_H_
#define _SYS_PCU_H_
-#if !defined(_KERNEL)
+#if !defined(_KERNEL) && !defined(_KMEMUSER)
#error "not supposed to be exposed to userland"
#endif
