xnu-1228.15.4.tar.gz

[apple/xnu.git] / osfmk / kern / host_notify.c

diff --git a/osfmk/kern/host_notify.c b/osfmk/kern/host_notify.c
index c18bea534c3a4126e562e8fddad8160f4b9bfd3c..064aab94e3a8d66723358092ac953568f22aa8bf 100644 (file)
--- a/osfmk/kern/host_notify.c
+++ b/osfmk/kern/host_notify.c
@@ -1,16 +1,19 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 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
  * 
  * 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.
+ * 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.
+ * 
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 2003 Apple Computer, Inc.  All rights reserved.
  */
 /*
  * Copyright (c) 2003 Apple Computer, Inc.  All rights reserved.


@@ -32,7 +35,9 @@
  */
 
 #include <mach/mach_types.h>
  */
 
 #include <mach/mach_types.h>

+#include <mach/mach_host.h>

 
 

+#include <kern/kern_types.h>

 #include <kern/ipc_kobject.h>
 #include <kern/host_notify.h>
 
 #include <kern/ipc_kobject.h>
 #include <kern/host_notify.h>
 


@@ -63,7 +68,7 @@ host_notify_init(void)
        for (i = 0; i <= HOST_NOTIFY_TYPE_MAX; i++)
                queue_init(&host_notify_queue[i]);
 
        for (i = 0; i <= HOST_NOTIFY_TYPE_MAX; i++)
                queue_init(&host_notify_queue[i]);
 

-       mutex_init(&host_notify_lock, ETAP_MISC_EVENT);
+       mutex_init(&host_notify_lock, 0);

 
        i = sizeof (struct host_notify_entry);
        host_notify_zone =
 
        i = sizeof (struct host_notify_entry);
        host_notify_zone =


@@ -98,7 +103,7 @@ host_request_notification(
                ip_unlock(port);
 
                mutex_unlock(&host_notify_lock);
                ip_unlock(port);
 
                mutex_unlock(&host_notify_lock);

-               zfree(host_notify_zone, (vm_offset_t)entry);
+               zfree(host_notify_zone, entry);

 
                return (KERN_FAILURE);
        }
 
                return (KERN_FAILURE);
        }


@@ -131,7 +136,7 @@ host_notify_port_destroy(
                assert(entry->port == port);
                remqueue(NULL, (queue_entry_t)entry);
                mutex_unlock(&host_notify_lock);
                assert(entry->port == port);
                remqueue(NULL, (queue_entry_t)entry);
                mutex_unlock(&host_notify_lock);

-               zfree(host_notify_zone, (vm_offset_t)entry);
+               zfree(host_notify_zone, entry);

 
                ipc_port_release_sonce(port);
                return;
 
                ipc_port_release_sonce(port);
                return;


@@ -179,7 +184,7 @@ host_notify_all(
                        ip_unlock(port);
 
                        mutex_unlock(&host_notify_lock);
                        ip_unlock(port);
 
                        mutex_unlock(&host_notify_lock);

-                       zfree(host_notify_zone, (vm_offset_t)entry);
+                       zfree(host_notify_zone, entry);

 
                        msg->msgh_remote_port = port;
 
 
                        msg->msgh_remote_port = port;