xnu-792.tar.gz

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

diff --git a/osfmk/i386/mp_events.h b/osfmk/i386/mp_events.h
index ae42a5950bf30b650af06a335e7668ae36943ec0..62da36894dd840526ca4a2921fc2a78909d5db50 100644 (file)
--- a/osfmk/i386/mp_events.h
+++ b/osfmk/i386/mp_events.h
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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,
- * 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -29,13 +26,13 @@
 
 #ifndef ASSEMBLER
 
+#include <sys/cdefs.h>
+
 typedef enum {
        MP_TLB_FLUSH = 0,
-       MP_CLOCK,
        MP_KDP,
        MP_KDB,
        MP_AST,
-       MP_SOFTCLOCK,
        MP_RENDEZVOUS,
        MP_IDLE,
        MP_UNIDLE,
@@ -43,13 +40,11 @@ typedef enum {
 } mp_event_t;
 
 #define MP_EVENT_NAME_DECL()   \
-char *mp_event_name[] = {      \
+const char *mp_event_name[] = {        \
        "MP_TLB_FLUSH",         \
-       "MP_CLOCK",             \
        "MP_KDP",               \
        "MP_KDB",               \
        "MP_AST",               \
-       "MP_SOFTCLOCK",         \
        "MP_RENDEZVOUS",        \
        "MP_IDLE",              \
        "MP_UNIDLE",            \
@@ -58,9 +53,14 @@ char *mp_event_name[] = {    \
        
 typedef enum { SYNC, ASYNC } mp_sync_t;
 
+__BEGIN_DECLS
+
 extern void    i386_signal_cpu(int cpu, mp_event_t event, mp_sync_t mode);
 extern void    i386_signal_cpus(mp_event_t event, mp_sync_t mode);
 extern int     i386_active_cpus(void);
+
+__END_DECLS
+
 #endif
 
 #endif