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

changes.

2 files changed, 15 insertions, 48 deletions

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_ */