Module Name: src
Committed By: he
Date: Sun Dec 26 21:05:35 UTC 2010
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Expose parts of struct cpu_info if _KMEMUSER is defined, for the benefit
of e.g. vmstat.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/hp700/include/cpu.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/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.54 src/sys/arch/hp700/include/cpu.h:1.55
--- src/sys/arch/hp700/include/cpu.h:1.54 Fri Dec 24 16:00:13 2010
+++ src/sys/arch/hp700/include/cpu.h Sun Dec 26 21:05:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.54 2010/12/24 16:00:13 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.55 2010/12/26 21:05:34 he Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -215,6 +215,10 @@
#define cpu_signotify(l) (setsoftast(l))
#define cpu_need_proftick(l) ((l)->l_pflag |= LP_OWEUPC, setsoftast(l))
+#endif /* _KERNEL */
+
+#if defined(_KERNEL) || defined(_KMEMUSER)
+
#include <sys/cpu_data.h>
/*
@@ -227,6 +231,7 @@
struct cpu_data ci_data; /* MI per-cpu data */
+#ifndef _KMEMUSER
#ifdef MULTIPROCESSOR
struct lwp *ci_curlwp; /* CPU owner */
#endif
@@ -238,8 +243,12 @@
volatile int ci_cpl;
volatile int ci_ipending; /* The pending interrupts. */
u_int ci_intr_depth; /* Nonzero iff running an interrupt. */
+#endif /* !_KMEMUSER */
} __aligned(64);
+#endif /* _KERNEL || _KMEMUSER */
+
+#if defined(_KERNEL)
/*
* definitions of cpu-dependent requirements
