Module Name: src
Committed By: phx
Date: Tue Dec 21 20:39:53 UTC 2010
Modified Files:
src/sys/arch/powerpc/include: cpu.h
Log Message:
All ports have to expose 'struct cpu_info' when _KMEMUSER is defined.
We will just expose cpu_info.ci_data for the moment, which is needed for
vmstat(1) to compile. Doing so with the whole cpu_info structure is
problematic, because of imask_t.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/powerpc/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/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.72 src/sys/arch/powerpc/include/cpu.h:1.73
--- src/sys/arch/powerpc/include/cpu.h:1.72 Sat Nov 13 13:13:34 2010
+++ src/sys/arch/powerpc/include/cpu.h Tue Dec 21 20:39:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.72 2010/11/13 13:13:34 uebayasi Exp $ */
+/* $NetBSD: cpu.h,v 1.73 2010/12/21 20:39:53 phx Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -42,23 +42,26 @@
int icache_line_size;
};
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_KMEMUSER)
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
#include "opt_multiprocessor.h"
#include "opt_ppcarch.h"
#endif
+#ifdef _KERNEL
#include <machine/frame.h>
#include <machine/psl.h>
#include <machine/intr.h>
#include <sys/device_if.h>
#include <sys/evcnt.h>
+#endif
#include <sys/cpu_data.h>
struct cpu_info {
struct cpu_data ci_data; /* MI per-cpu data */
+#ifdef _KERNEL
struct device *ci_dev; /* device of corresponding cpu */
struct lwp *ci_curlwp; /* current owner of the processor */
@@ -135,7 +138,11 @@
struct evcnt ci_ev_vecsw; /* Altivec context switches */
struct evcnt ci_ev_umchk; /* user MCHK events */
struct evcnt ci_ev_ipi; /* IPIs received */
+#endif /* _KERNEL */
};
+#endif /* _KERNEL || _KMEMUSER */
+
+#ifdef _KERNEL
#ifdef MULTIPROCESSOR
