xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / i386 / cpu_number.h

diff --git a/osfmk/i386/cpu_number.h b/osfmk/i386/cpu_number.h
index b0348fce61f961a477afa68b5e3301ab53725b65..bc2e120bbe96f8e5485cbf1618ac0514d2c99c75 100644 (file)
--- a/osfmk/i386/cpu_number.h
+++ b/osfmk/i386/cpu_number.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,34 +22,34 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 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.
  */
@@ -61,23 +61,14 @@
  *     Machine-dependent definitions for cpu identification.
  *
  */
-#ifndef        _I386_CPU_NUMBER_H_
-#define        _I386_CPU_NUMBER_H_
+#ifndef _I386_CPU_NUMBER_H_
+#define _I386_CPU_NUMBER_H_
 
-#ifdef KERNEL_PRIVATE
+#ifdef  KERNEL_PRIVATE
 
 /* Use a function to do this less directly. */
-extern int     cpu_number(void);
-
-#ifdef MACH_KERNEL_PRIVATE
-#include <i386/cpu_data.h>
-
-/* Get the cpu number directly from the pre-processor data area */
-#define        cpu_number()    get_cpu_number()
-
-#endif /* !MACH_KERNEL_PRIVATE */
-
-#endif /* KERNEL_PRIVATE */
+extern int      cpu_number(void);
 
-#endif /* _I386_CPU_NUMBER_H_ */
+#endif  /* KERNEL_PRIVATE */
 
+#endif  /* _I386_CPU_NUMBER_H_ */