Module Name: src
Committed By: rmind
Date: Sun May 9 20:25:45 UTC 2010
Modified Files:
src/sys/sys [matt-nb5-mips64]: cpu_data.h
Log Message:
Pull-up rev 1.30 from HEAD. OK m...@.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.16.1 src/sys/sys/cpu_data.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/cpu_data.h
diff -u src/sys/sys/cpu_data.h:1.27 src/sys/sys/cpu_data.h:1.27.16.1
--- src/sys/sys/cpu_data.h:1.27 Tue Jun 3 15:50:22 2008
+++ src/sys/sys/cpu_data.h Sun May 9 20:25:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_data.h,v 1.27 2008/06/03 15:50:22 ad Exp $ */
+/* $NetBSD: cpu_data.h,v 1.27.16.1 2010/05/09 20:25:45 rmind Exp $ */
/*-
* Copyright (c) 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,11 @@
int cpu_xcall_pending; /* cross-call support */
lwp_t *cpu_onproc; /* bottom level LWP */
CIRCLEQ_ENTRY(cpu_info) cpu_qchain; /* circleq of all CPUs */
-
+
+ cpuid_t cpu_node_id;
+ cpuid_t cpu_core_id;
+ cpuid_t cpu_smt_id;
+
/*
* This section is mostly CPU-private.
*/
@@ -109,6 +113,10 @@
#define ci_spin_locks2 ci_data.cpu_spin_locks2
#define ci_lkdebug_recurse ci_data.cpu_lkdebug_recurse
+#define ci_node_id ci_data.cpu_node_id
+#define ci_core_id ci_data.cpu_core_id
+#define ci_smt_id ci_data.cpu_smt_id
+
int mi_cpu_attach(struct cpu_info *ci);
#endif /* _SYS_CPU_DATA_H_ */
