xnu-792.6.61.tar.gz

[apple/xnu.git] / osfmk / kern / exception.h

diff --git a/osfmk/kern/exception.h b/osfmk/kern/exception.h
index e7a0225b5a6414dd0460625d2e3ed5667d868743..766e216b4178c04397a257d8d8848e2bf7306e86 100644 (file)
--- a/osfmk/kern/exception.h
+++ b/osfmk/kern/exception.h
@@ -1,24 +1,21 @@
 /*
 /*

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

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @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,
  * 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@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -26,8 +23,8 @@
  * @OSF_COPYRIGHT@
  */
 
  * @OSF_COPYRIGHT@
  */
 

-#ifndef _EXCEPTION_H_
-#define _EXCEPTION_H_
+#ifndef _KERN_EXCEPTION_H_
+#define _KERN_EXCEPTION_H_

 
 #include <mach/mach_types.h>
 #include <mach/thread_status.h>
 
 #include <mach/mach_types.h>
 #include <mach/thread_status.h>


@@ -45,7 +42,7 @@ struct exception_action {
 };
 
 /* Make an up-call to a thread's exception server */
 };
 
 /* Make an up-call to a thread's exception server */

-extern void exception(
+extern void exception_triage(

        exception_type_t        exception,
        exception_data_t        code,
        mach_msg_type_number_t  codeCnt);
        exception_type_t        exception,
        exception_data_t        code,
        mach_msg_type_number_t  codeCnt);


@@ -55,4 +52,4 @@ extern kern_return_t sys_perf_notify(struct task *task,
        exception_data_t        code,
        mach_msg_type_number_t  codeCnt);
 
        exception_data_t        code,
        mach_msg_type_number_t  codeCnt);
 

-#endif /* _EXCEPTION_H_ */
+#endif /* _KERN_EXCEPTION_H_ */