xnu-792.tar.gz

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

diff --git a/osfmk/kern/norma_protos.h b/osfmk/kern/norma_protos.h
index ab0eb5a7502a2368ad57d06f772b8189c9fdae89..2f45824a95ba176a3d111f5075bed65c2e45fea2 100644 (file)
--- a/osfmk/kern/norma_protos.h
+++ b/osfmk/kern/norma_protos.h
@@ -1,66 +1,27 @@
 /*
 /*

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

-/*
- * HISTORY
- * 
- * Revision 1.1.1.1  1998/09/22 21:05:34  wsanchez
- * Import of Mac OS X kernel (~semeria)
- *
- * Revision 1.1.1.1  1998/03/07 02:25:55  wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.1.4.1  1995/02/23  17:31:45  alanl
- *     DIPC:  Merge from nmk17b2 to nmk18b8.
- *     [95/01/05            alanl]
- *
- * Revision 1.1.10.1  1994/12/01  20:43:40  dwm
- *     mk6 CR801 - copyright marker not FREE_
- *     [1994/12/01  19:25:52  dwm]
- * 
- * Revision 1.1.5.2  1994/09/10  21:47:18  bolinger
- *     Merge up to NMK17.3
- *     [1994/09/08  19:58:04  bolinger]
- * 
- * Revision 1.1.5.1  1994/06/21  19:43:06  dlb
- *     Bring forward to NMK18
- *     [1994/06/17  18:58:04  dlb]
- * 
- * Revision 1.1.2.2  1994/07/22  09:54:09  paire
- *     Added vm_remap_remote prototype.
- *     [94/07/05            paire]
- * 
- * Revision 1.1.2.1  1994/12/06  20:11:22  alanl
- *     Initial revision.  Moved here from kern/norma_task.h to avoid a
- *     name collision with the mig-generated kern/norma_task.h.
- *     [94/12/05            mmp]
- * 
- * $EndLog$
- */

 /* 
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
 /* 
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University


@@ -90,24 +51,24 @@
 #ifndef        _KERN_NORMA_PROTOS_H_
 #define        _KERN_NORMA_PROTOS_H_
 
 #ifndef        _KERN_NORMA_PROTOS_H_
 #define        _KERN_NORMA_PROTOS_H_
 

-extern void            task_copy_vm(
-                               ipc_port_t      host,
-                               vm_map_t        old_map,
-                               boolean_t       clone,
-                               boolean_t       kill_parent,
-                               ipc_port_t      to);
+extern void task_copy_vm(
+                       ipc_port_t              host,
+                       vm_map_t                old_map,
+                       boolean_t               clone,
+                       boolean_t               kill_parent,
+                       ipc_port_t              to);

 
 

-extern kern_return_t   vm_remap_remote(
-                               ipc_port_t      target_task_port,
-                               vm_offset_t     *target_address,
-                               vm_size_t       size,
-                               vm_offset_t     mask,
-                               boolean_t       anywhere,
-                               ipc_port_t      source_task_port,
-                               vm_offset_t     source_address,
-                               boolean_t       copy,
-                               vm_prot_t       *cur_protection,
-                               vm_prot_t       *max_protection,
-                               vm_inherit_t    inheritance);
+extern kern_return_t vm_remap_remote(
+                       ipc_port_t              target_task_port,
+                       mach_vm_offset_t        *target_address,
+                       mach_vm_size_t          size,
+                       mach_vm_offset_t        mask,
+                       boolean_t               anywhere,
+                       ipc_port_t              source_task_port,
+                       mach_vm_offset_t        source_address,
+                       boolean_t               copy,
+                       vm_prot_t               *cur_protection,
+                       vm_prot_t               *max_protection,
+                       vm_inherit_t            inheritance);

 
 #endif /* _KERN_NORMA_PROTOS_H_ */
 
 #endif /* _KERN_NORMA_PROTOS_H_ */