Merge <machine/cpu_number.h> into <machine/cpu.h>, preparing for intrusive

changes.

21 files changed, 32 insertions, 88 deletions

diff --git a/sys/arch/luna88k/ddb/db_interface.c b/sys/arch/luna88k/ddb/db_interface.c
index 7a301b19c78..9067a486732 100644
--- a/sys/arch/luna88k/ddb/db_interface.c
+++ b/sys/arch/luna88k/ddb/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.3 2004/09/30 21:48:53 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.4 2005/10/13 19:48:28 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -42,7 +42,6 @@
 #include <machine/trap.h>		/* current_thread()	*/
 #include <machine/db_machdep.h>		/* local ddb stuff	*/
 #include <machine/locore.h>
-#include <machine/cpu_number.h>
 #ifdef M88100
 #include <machine/m88100.h>
 #include <machine/m8820x.h>
diff --git a/sys/arch/luna88k/include/cpu_number.h b/sys/arch/luna88k/include/cpu_number.h
deleted file mode 100644
index 103a60e750e..00000000000
--- a/sys/arch/luna88k/include/cpu_number.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: cpu_number.h,v 1.3 2004/04/26 14:31:08 miod Exp $ */
-/* public domain */
-#include <m88k/cpu_number.h>
diff --git a/sys/arch/luna88k/luna88k/clock.c b/sys/arch/luna88k/luna88k/clock.c
index ec30a13a70e..772883e17c4 100644
--- a/sys/arch/luna88k/luna88k/clock.c
+++ b/sys/arch/luna88k/luna88k/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.4 2004/12/28 12:06:49 miod Exp $ */
+/* $OpenBSD: clock.c,v 1.5 2005/10/13 19:48:31 miod Exp $ */
 /* $NetBSD: clock.c,v 1.2 2000/01/11 10:29:35 nisimura Exp $ */
 
 /*
@@ -52,7 +52,6 @@
 #include <sys/evcount.h>
 
 #include <machine/cpu.h>
-#include <machine/cpu_number.h>
 
 #include <dev/clock_subr.h>
 #include <luna88k/luna88k/clockvar.h>
diff --git a/sys/arch/luna88k/luna88k/m8820x.c b/sys/arch/luna88k/luna88k/m8820x.c
index edc672b5a8e..9fd9c0d089e 100644
--- a/sys/arch/luna88k/luna88k/m8820x.c
+++ b/sys/arch/luna88k/luna88k/m8820x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.c,v 1.6 2005/04/27 14:07:36 miod Exp $	*/
+/*	$OpenBSD: m8820x.c,v 1.7 2005/10/13 19:48:31 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -89,7 +89,6 @@
 #include <machine/asm_macro.h>
 #include <machine/board.h>
 #include <machine/cmmu.h>
-#include <machine/cpu_number.h>
 #include <machine/locore.h>
 #include <machine/m8820x.h>
 
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 162d826f7d2..195f97e3cfe 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.23 2005/10/12 19:05:39 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.24 2005/10/13 19:48:32 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -86,7 +86,6 @@
 #include <machine/board.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
-#include <machine/cpu_number.h>
 #include <machine/kcore.h>
 #include <machine/locore.h>
 #include <machine/reg.h>
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index bb5a253b778..948bb00fe56 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.6 2005/10/12 19:05:43 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.7 2005/10/13 19:48:32 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -61,6 +61,20 @@
 #include <machine/pcb.h>
 #include <machine/psl.h>
 
+#ifndef _LOCORE
+
+static unsigned cpu_number(void);
+
+static __inline__ unsigned cpu_number(void)
+{
+	unsigned cpu;
+
+	__asm__ __volatile__ ("ldcr %0, cr18" : "=r" (cpu));
+	return (cpu & 3);
+}
+
+#endif /* _LOCORE */
+
 /*
  * definitions of cpu-dependent requirements
  * referenced in generic code
diff --git a/sys/arch/m88k/include/cpu_number.h b/sys/arch/m88k/include/cpu_number.h
deleted file mode 100644
index e5f49d990bf..00000000000
--- a/sys/arch/m88k/include/cpu_number.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$OpenBSD: cpu_number.h,v 1.1 2004/04/26 12:34:05 miod Exp $	*/
-
-/*
- * Mach Operating System
- * Copyright (c) 1993-1992 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-#ifndef	_M88K_CPU_NUMBER_
-#define _M88K_CPU_NUMBER_
-
-#ifdef	_KERNEL
-#ifndef _LOCORE
-
-static unsigned cpu_number(void);
-
-static __inline__ unsigned cpu_number(void)
-{
-	unsigned cpu;
-
-	__asm__ __volatile__ ("ldcr %0, cr18" : "=r" (cpu));
-	return (cpu & 3);
-}
-
-#endif /* _LOCORE */
-#endif /* _KERNEL */
-#endif /* _M88K_CPU_NUMBER_ */
diff --git a/sys/arch/m88k/m88k/cmmu.c b/sys/arch/m88k/m88k/cmmu.c
index b38e19e90c4..dbf6f223747 100644
--- a/sys/arch/m88k/m88k/cmmu.c
+++ b/sys/arch/m88k/m88k/cmmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.c,v 1.3 2005/04/27 14:07:38 miod Exp $	*/
+/*	$OpenBSD: cmmu.c,v 1.4 2005/10/13 19:48:33 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -64,7 +64,6 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/cmmu.h>
-#include <machine/cpu_number.h>
 
 /*
  * This lock protects the cmmu SAR and SCR's; other ports
diff --git a/sys/arch/m88k/m88k/m8820x_machdep.c b/sys/arch/m88k/m88k/m8820x_machdep.c
index 09c426f80a4..ca929a0bea8 100644
--- a/sys/arch/m88k/m88k/m8820x_machdep.c
+++ b/sys/arch/m88k/m88k/m8820x_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x_machdep.c,v 1.8 2005/09/25 22:41:14 miod Exp $	*/
+/*	$OpenBSD: m8820x_machdep.c,v 1.9 2005/10/13 19:48:33 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -89,7 +89,6 @@
 
 #include <machine/asm_macro.h>
 #include <machine/cmmu.h>
-#include <machine/cpu_number.h>
 #include <machine/locore.h>
 #include <machine/m8820x.h>
 
diff --git a/sys/arch/m88k/m88k/m88k_machdep.c b/sys/arch/m88k/m88k/m88k_machdep.c
index 6a0d5417e64..1b771ac0cb7 100644
--- a/sys/arch/m88k/m88k/m88k_machdep.c
+++ b/sys/arch/m88k/m88k/m88k_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88k_machdep.c,v 1.6 2005/10/12 19:30:28 miod Exp $	*/
+/*	$OpenBSD: m88k_machdep.c,v 1.7 2005/10/13 19:48:33 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -55,7 +55,6 @@
 
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
-#include <machine/cpu_number.h>
 #include <machine/reg.h>
 #ifdef M88100
 #include <machine/m88100.h>
diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c
index 4f7ebb6adb2..91d4229ca44 100644
--- a/sys/arch/m88k/m88k/pmap.c
+++ b/sys/arch/m88k/m88k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.13 2005/10/12 19:05:44 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.14 2005/10/13 19:48:33 miod Exp $	*/
 /*
  * Copyright (c) 2001-2004, Miodrag Vallat
  * Copyright (c) 1998-2001 Steve Murphree, Jr.
@@ -58,7 +58,6 @@
 
 #include <machine/asm_macro.h>
 #include <machine/cmmu.h>
-#include <machine/cpu_number.h>
 #include <machine/pmap_table.h>
 
 /*
diff --git a/sys/arch/m88k/m88k/subr.S b/sys/arch/m88k/m88k/subr.S
index a7a21a05554..8a9d909e0d2 100644
--- a/sys/arch/m88k/m88k/subr.S
+++ b/sys/arch/m88k/m88k/subr.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr.S,v 1.7 2005/10/12 19:32:19 miod Exp $	*/
+/* $OpenBSD: subr.S,v 1.8 2005/10/13 19:48:33 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -33,7 +33,6 @@
 #include <sys/errno.h>
 
 #include <machine/asm.h>
-#include <machine/cpu_number.h>
 #include <machine/trap.h>
 
 #ifdef	M88100
diff --git a/sys/arch/m88k/m88k/vm_machdep.c b/sys/arch/m88k/m88k/vm_machdep.c
index 5a0603657b5..6baa75f7f4d 100644
--- a/sys/arch/m88k/m88k/vm_machdep.c
+++ b/sys/arch/m88k/m88k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.6 2005/10/12 19:05:44 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.7 2005/10/13 19:48:33 miod Exp $	*/
 
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -58,7 +58,6 @@
 #include <machine/mmu.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
-#include <machine/cpu_number.h>
 #include <machine/locore.h>
 #include <machine/trap.h>
 
diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c
index 0e05ec143fc..402b3572585 100644
--- a/sys/arch/mvme88k/ddb/db_interface.c
+++ b/sys/arch/mvme88k/ddb/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.44 2005/04/30 16:44:11 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.45 2005/10/13 19:48:34 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -43,7 +43,6 @@
 #include <machine/db_machdep.h>		/* local ddb stuff	*/
 #include <machine/bugio.h>		/* bug routines		*/
 #include <machine/locore.h>
-#include <machine/cpu_number.h>
 #ifdef M88100
 #include <machine/m88100.h>
 #include <machine/m8820x.h>
diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c
index f3424c9ac24..9cebc3f5f1c 100644
--- a/sys/arch/mvme88k/dev/dart.c
+++ b/sys/arch/mvme88k/dev/dart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dart.c,v 1.43 2005/04/30 16:40:42 miod Exp $	*/
+/*	$OpenBSD: dart.c,v 1.44 2005/10/13 19:48:34 miod Exp $	*/
 
 /*
  * Mach Operating System
@@ -41,7 +41,6 @@
 #include <machine/autoconf.h>
 #include <machine/conf.h>
 #include <machine/cpu.h>
-#include <machine/cpu_number.h>
 #include <machine/locore.h>
 #include <machine/psl.h>
 
diff --git a/sys/arch/mvme88k/dev/mainbus.c b/sys/arch/mvme88k/dev/mainbus.c
index 045afcd841f..fc4cd90bed0 100644
--- a/sys/arch/mvme88k/dev/mainbus.c
+++ b/sys/arch/mvme88k/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.15 2005/09/25 20:55:15 miod Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.16 2005/10/13 19:48:35 miod Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 2004, Miodrag Vallat.
@@ -39,7 +39,6 @@
 #include <machine/autoconf.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
-#include <machine/cpu_number.h>
 
 #ifdef MVME188
 #include <machine/mvme188.h>
diff --git a/sys/arch/mvme88k/include/cpu_number.h b/sys/arch/mvme88k/include/cpu_number.h
deleted file mode 100644
index f1bd13e8eb2..00000000000
--- a/sys/arch/mvme88k/include/cpu_number.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: cpu_number.h,v 1.15 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/cpu_number.h>
diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c
index 3b03583c2eb..a64c3560b3a 100644
--- a/sys/arch/mvme88k/mvme88k/m188_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m188_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m188_machdep.c,v 1.9 2005/09/06 19:41:28 miod Exp $	*/
+/*	$OpenBSD: m188_machdep.c,v 1.10 2005/10/13 19:48:36 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -54,7 +54,6 @@
 #include <machine/asm_macro.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
-#include <machine/cpu_number.h>
 #include <machine/locore.h>
 #include <machine/reg.h>
 #include <machine/trap.h>
diff --git a/sys/arch/mvme88k/mvme88k/m88110.c b/sys/arch/mvme88k/mvme88k/m88110.c
index b657aab5026..63abdda01c7 100644
--- a/sys/arch/mvme88k/mvme88k/m88110.c
+++ b/sys/arch/mvme88k/mvme88k/m88110.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88110.c,v 1.24 2005/09/25 22:41:14 miod Exp $	*/
+/*	$OpenBSD: m88110.c,v 1.25 2005/10/13 19:48:36 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * All rights reserved.
@@ -64,7 +64,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu_number.h>
 #include <machine/cmmu.h>
 #include <machine/m88110.h>
 #include <machine/m88410.h>
diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c
index 82e88b0edb7..1efba9188ca 100644
--- a/sys/arch/mvme88k/mvme88k/m8820x.c
+++ b/sys/arch/mvme88k/mvme88k/m8820x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.c,v 1.41 2005/04/27 14:07:38 miod Exp $	*/
+/*	$OpenBSD: m8820x.c,v 1.42 2005/10/13 19:48:37 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -30,7 +30,6 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/asm_macro.h>
-#include <machine/cpu_number.h>
 #ifdef DEBUG
 #include <machine/locore.h>
 #endif
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 16e38ca0e01..72f35e9336c 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.168 2005/10/12 19:05:44 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.169 2005/10/13 19:48:37 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -74,7 +74,6 @@
 #include <machine/bugio.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
-#include <machine/cpu_number.h>
 #include <machine/kcore.h>
 #include <machine/locore.h>
 #include <machine/reg.h>