Module Name: src
Committed By: christos
Date: Tue Jan 21 20:18:46 UTC 2014
Modified Files:
src/sys/arch/alpha/include: cpu.h
Log Message:
rumpkernel needs ci_pcc_freq
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/alpha/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/alpha/include/cpu.h
diff -u src/sys/arch/alpha/include/cpu.h:1.80 src/sys/arch/alpha/include/cpu.h:1.81
--- src/sys/arch/alpha/include/cpu.h:1.80 Sat Nov 9 19:50:13 2013
+++ src/sys/arch/alpha/include/cpu.h Tue Jan 21 15:18:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.80 2013/11/10 00:50:13 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.81 2014/01/21 20:18:46 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@ struct cpu_info {
*/
struct lwp *ci_curlwp; /* current owner of the processor */
struct cpu_data ci_data; /* MI per-cpu data */
-#ifndef _KMEMUSER
+#if !defined(_KMEMUSER) || defined(_RUMPKERNEL)
struct cctr_state ci_cc; /* cycle counter state */
struct cpu_info *ci_next; /* next cpu_info structure */
int ci_mtx_count;
@@ -130,7 +130,7 @@ struct cpu_info {
volatile u_long ci_flags; /* flags; see below */
volatile u_long ci_ipis; /* interprocessor interrupts pending */
#endif
-#endif /* _KMEMUSER */
+#endif /* !_KMEMUSER || _RUMPKERNEL */
};
#endif /* _KERNEL || _KMEMUSER */
