Module Name: src
Committed By: rmind
Date: Thu Feb 17 19:58:35 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: mi
src/sys/sys: Makefile pcu.h
Log Message:
Fix sys/pcu.h build breakage.
To generate a diff of this commit:
cvs rdiff -u -r1.1588 -r1.1589 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.128 -r1.129 src/sys/sys/Makefile
cvs rdiff -u -r1.2 -r1.3 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/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1588 src/distrib/sets/lists/comp/mi:1.1589
--- src/distrib/sets/lists/comp/mi:1.1588 Wed Feb 16 23:48:51 2011
+++ src/distrib/sets/lists/comp/mi Thu Feb 17 19:58:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1588 2011/02/16 23:48:51 pooka Exp $
+# $NetBSD: mi,v 1.1589 2011/02/17 19:58:34 rmind Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2104,6 +2104,7 @@
./usr/include/sys/null.h comp-c-include
./usr/include/sys/optstr.h comp-obsolete obsolete
./usr/include/sys/param.h comp-c-include
+./usr/include/sys/pcu.h comp-c-include
./usr/include/sys/pipe.h comp-c-include
./usr/include/sys/pmc.h comp-c-include
./usr/include/sys/pmf.h comp-obsolete obsolete
Index: src/sys/sys/Makefile
diff -u src/sys/sys/Makefile:1.128 src/sys/sys/Makefile:1.129
--- src/sys/sys/Makefile:1.128 Sat Sep 25 01:42:40 2010
+++ src/sys/sys/Makefile Thu Feb 17 19:58:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2010/09/25 01:42:40 matt Exp $
+# $NetBSD: Makefile,v 1.129 2011/02/17 19:58:34 rmind Exp $
.include <bsd.sys.mk>
@@ -24,7 +24,7 @@
malloc.h mallocvar.h mbuf.h md4.h md5.h midiio.h \
mman.h module.h mount.h mqueue.h msg.h msgbuf.h mtio.h mutex.h \
namei.h null.h \
- param.h pipe.h pmc.h poll.h pool.h power.h proc.h \
+ param.h pcu.h pipe.h pmc.h poll.h pool.h power.h proc.h \
protosw.h pset.h ptrace.h ptree.h \
queue.h \
ras.h rbtree.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \
Index: src/sys/sys/pcu.h
diff -u src/sys/sys/pcu.h:1.2 src/sys/sys/pcu.h:1.3
--- src/sys/sys/pcu.h:1.2 Thu Feb 17 18:44:54 2011
+++ src/sys/sys/pcu.h Thu Feb 17 19:58:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcu.h,v 1.2 2011/02/17 18:44:54 matt Exp $ */
+/* $NetBSD: pcu.h,v 1.3 2011/02/17 19:58:34 rmind Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,10 +32,6 @@
#ifndef _SYS_PCU_H_
#define _SYS_PCU_H_
-#if !defined(_KERNEL) && !defined(_KMEMUSER)
-#error "Kernel-only header"
-#endif
-
/*
* Default: one PCU for MD.
*/
@@ -43,6 +39,8 @@
#define PCU_UNIT_COUNT 1
#endif
+#if defined(_KERNEL)
+
typedef struct {
u_int pcu_id;
void (*pcu_state_save)(lwp_t *, bool);
@@ -55,3 +53,5 @@
bool pcu_used(const pcu_ops_t *, lwp_t *);
#endif
+
+#endif
