xnu-1228.5.18.tar.gz

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

diff --git a/osfmk/i386/machine_rpc.h b/osfmk/i386/machine_rpc.h
index 73e7bb253187b2bdc1889e8a977d8cb00e4100f8..5e29e95045d946c497d88648097b304ef8b7939f 100644 (file)
--- a/osfmk/i386/machine_rpc.h
+++ b/osfmk/i386/machine_rpc.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2002,2000 Apple Computer, 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@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -25,19 +31,4 @@
 #ifndef _MACHINE_RPC_H_
 #define _MACHINE_RPC_H_
 
 #ifndef _MACHINE_RPC_H_
 #define _MACHINE_RPC_H_
 

-#if     ETAP_EVENT_MONITOR
-#define ETAP_EXCEPTION_PROBE(_f, _th, _ex, _sysnum)             \
-        if (_ex == EXC_SYSCALL) {                               \
-                ETAP_PROBE_DATA(ETAP_P_SYSCALL_UNIX,            \
-                                _f,                             \
-                                _th,                            \
-                                _sysnum,                        \
-                                sizeof(int));                   \
-        }
-#else   /* ETAP_EVENT_MONITOR */
-#define ETAP_EXCEPTION_PROBE(_f, _th, _ex, _sysnum)
-#endif  /* ETAP_EVENT_MONITOR */
-
-extern void exception_return_wrapper( void );
-

 #endif /* _MACHINE_RPC_H_ */
 #endif /* _MACHINE_RPC_H_ */