summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2008-10-09 08:43:44 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2008-10-09 08:43:44 +0000
commitaa2e9c218afd7017248868c62135ad22af765b6e (patch)
tree5d3a5e8e8f84c714f7775d89aa8a28271cc851b4
parent87da5fdb127c46861bb1c751d8e05869349763aa (diff)
Implement CPU_INFO_UNIT for everyone, not just MP kernels.
ok miod@
-rw-r--r--sys/arch/arm/include/cpu.h3
-rw-r--r--sys/arch/hppa/include/cpu.h3
-rw-r--r--sys/arch/m68k/include/cpu.h3
-rw-r--r--sys/arch/mips64/include/cpu.h3
-rw-r--r--sys/arch/sh/include/cpu.h3
-rw-r--r--sys/arch/sparc/sparc/cpuvar.h3
-rw-r--r--sys/arch/sparc64/include/cpu.h3
-rw-r--r--sys/arch/vax/include/cpu.h3
8 files changed, 16 insertions, 8 deletions
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index 0c418dcb21f..9f721f1670d 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.19 2008/07/18 23:43:31 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.20 2008/10/09 08:43:43 art Exp $ */
/* $NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $ */
/*
@@ -226,6 +226,7 @@ extern struct cpu_info cpu_info_store;
#define CPU_INFO_ITERATOR int
#define CPU_INFO_FOREACH(cii, ci) \
for (cii = 0, ci = curcpu(); ci != NULL; ci = NULL)
+#define CPU_INFO_UNIT(ci) 0
#endif
#ifdef __PROG32
diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h
index 243855f1096..d7fcba4b38c 100644
--- a/sys/arch/hppa/include/cpu.h
+++ b/sys/arch/hppa/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
+/* $OpenBSD: cpu.h,v 1.56 2008/10/09 08:43:43 art Exp $ */
/*
* Copyright (c) 2000-2004 Michael Shalayeff
@@ -81,6 +81,7 @@ extern struct cpu_info cpu_info_primary;
#define CPU_INFO_ITERATOR int
#define CPU_INFO_FOREACH(cii, ci) \
for (cii = 0, ci = curcpu(); ci != NULL; ci = NULL)
+#define CPU_INFO_UNIT(ci) 0
#define cpu_number() 0
diff --git a/sys/arch/m68k/include/cpu.h b/sys/arch/m68k/include/cpu.h
index 9b3843e760e..47d9342a649 100644
--- a/sys/arch/m68k/include/cpu.h
+++ b/sys/arch/m68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.18 2007/10/10 15:53:52 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.19 2008/10/09 08:43:43 art Exp $ */
/* $NetBSD: cpu.h,v 1.3 1997/02/02 06:56:57 thorpej Exp $ */
/*
@@ -83,6 +83,7 @@ extern struct cpu_info cpu_info_store;
#define CPU_INFO_ITERATOR int
#define CPU_INFO_FOREACH(cii, ci) \
for (cii = 0, ci = curcpu(); ci != NULL; ci = NULL)
+#define CPU_INFO_UNIT(ci) 0
#define cpu_number() 0
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index 3a5d6d96f78..be6846f83e8 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.25 2008/07/18 23:43:31 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.26 2008/10/09 08:43:43 art Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -384,6 +384,7 @@ extern struct cpu_info cpu_info_primary;
#define CPU_INFO_ITERATOR int
#define CPU_INFO_FOREACH(cii, ci) \
for (cii = 0, ci = curcpu(); ci != NULL; ci = NULL)
+#define CPU_INFO_UNIT(ci) 0
#define cpu_number() 0
diff --git a/sys/arch/sh/include/cpu.h b/sys/arch/sh/include/cpu.h
index dd2cd3138d1..33424e76146 100644
--- a/sys/arch/sh/include/cpu.h
+++ b/sys/arch/sh/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.14 2008/07/18 23:43:31 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.15 2008/10/09 08:43:43 art Exp $ */
/* $NetBSD: cpu.h,v 1.41 2006/01/21 04:24:12 uwe Exp $ */
/*-
@@ -68,6 +68,7 @@ extern struct cpu_info cpu_info_store;
#define CPU_INFO_ITERATOR int
#define CPU_INFO_FOREACH(cii, ci) \
for (cii = 0, ci = curcpu(); ci != NULL; ci = NULL)
+#define CPU_INFO_UNIT(ci) 0
/*
diff --git a/sys/arch/sparc/sparc/cpuvar.h b/sys/arch/sparc/sparc/cpuvar.h
index 86b9154d210..a818d7f54c4 100644
--- a/sys/arch/sparc/sparc/cpuvar.h
+++ b/sys/arch/sparc/sparc/cpuvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpuvar.h,v 1.12 2008/06/26 05:42:13 ray Exp $ */
+/* $OpenBSD: cpuvar.h,v 1.13 2008/10/09 08:43:43 art Exp $ */
/* $NetBSD: cpuvar.h,v 1.4 1997/07/06 21:14:25 pk Exp $ */
/*
@@ -87,6 +87,7 @@ struct cpu_info {
#define CPU_INFO_ITERATOR int
#define CPU_INFO_FOREACH(cii, ci) \
for (cii = 0, ci = curcpu(); ci != NULL; ci = ci->ci_next)
+#define CPU_INFO_UNIT(ci) ((ci)->ci_softc->dv.dv_unit)
/*
* The cpu_softc structure. This structure maintains information about one
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 4fa56d7688f..09cb7914810 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.66 2008/08/10 14:13:05 kettenis Exp $ */
+/* $OpenBSD: cpu.h,v 1.67 2008/10/09 08:43:43 art Exp $ */
/* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
/*
@@ -192,6 +192,7 @@ void smp_signotify(struct proc *);
#define CPU_INFO_ITERATOR int
#define CPU_INFO_FOREACH(cii, ci) \
for (cii = 0, ci = curcpu(); ci != NULL; ci = NULL)
+#define CPU_INFO_UNIT(ci) 0
#endif
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index 104eaec2ebb..b8820ac7cc5 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.29 2008/08/18 23:05:37 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.30 2008/10/09 08:43:43 art Exp $ */
/* $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $ */
/*
@@ -63,6 +63,7 @@ extern struct cpu_info cpu_info_store;
#define CPU_INFO_ITERATOR int
#define CPU_INFO_FOREACH(cii, ci) \
for (cii = 0, ci = curcpu(); ci != NULL; ci = NULL)
+#define CPU_INFO_UNIT(ci) 0
struct clockframe {
int pc;