xnu-3789.1.32.tar.gz

[apple/xnu.git] / osfmk / machine / commpage.h

diff --git a/osfmk/machine/commpage.h b/osfmk/machine/commpage.h
index 9a8736507d791188f97bb136d895b4484ee69624..2a525b0f2c7657bfc1ff4e874837769965fa26ea 100644 (file)
--- a/osfmk/machine/commpage.h
+++ b/osfmk/machine/commpage.h
@@ -1,31 +1,35 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 
 #ifndef _MACHINE_COMMPAGE_H
 #define _MACHINE_COMMPAGE_H
 
  */
 
 #ifndef _MACHINE_COMMPAGE_H
 #define _MACHINE_COMMPAGE_H
 

-#if defined (__ppc__)
-#include "ppc/commpage/commpage.h"
-#elif defined (__i386__)
+#if defined (__i386__) || defined (__x86_64__)

 #include "i386/commpage/commpage.h"
 #else
 #error architecture not supported
 #include "i386/commpage/commpage.h"
 #else
 #error architecture not supported


@@ -34,7 +38,7 @@
 #ifndef        __ASSEMBLER__
 
 extern void    commpage_populate( void );      /* called once during startup */
 #ifndef        __ASSEMBLER__
 
 extern void    commpage_populate( void );      /* called once during startup */

-
+extern  void   commpage_text_populate( void );

 #endif /* __ASSEMBLER__ */
 
 #endif /* _MACHINE_COMMPAGE_H */
 #endif /* __ASSEMBLER__ */
 
 #endif /* _MACHINE_COMMPAGE_H */