xnu-344.49.tar.gz

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

diff --git a/osfmk/kern/ipc_mig.c b/osfmk/kern/ipc_mig.c
index 2b22fcf1ff608af660e89b5faeb2ef3a81248e56..a880cdea1d31a8555ddaca07497c76f3b65dc920 100644 (file)
--- a/osfmk/kern/ipc_mig.c
+++ b/osfmk/kern/ipc_mig.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * 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@
  */
@@ -50,9 +53,6 @@
 /*
  */
 
-#include <libkern/OSTypes.h>
-#include <libkern/OSAtomic.h>
-
 #include <mach/boolean.h>
 #include <mach/port.h>
 #include <mach/mig.h>
@@ -148,13 +148,9 @@ mach_msg_rpc_from_kernel(
        if (mr != MACH_MSG_SUCCESS)
                return mr;
 
-       rpc_lock(self);
-
        reply = self->ith_rpc_reply;
        if (reply == IP_NULL) {
-               rpc_unlock(self);
                reply = ipc_port_alloc_reply();
-               rpc_lock(self);
                if ((reply == IP_NULL) ||
                    (self->ith_rpc_reply != IP_NULL))
                        panic("mach_msg_rpc_from_kernel");
@@ -167,7 +163,6 @@ mach_msg_rpc_from_kernel(
                MACH_MSGH_BITS(0, MACH_MSG_TYPE_MAKE_SEND_ONCE);
 
        ipc_port_reference(reply);
-       rpc_unlock(self);
 
        ipc_kmsg_copyin_from_kernel(kmsg);
 
@@ -439,9 +434,9 @@ mig_put_reply_port(
  */
 int 
 mig_strncpy(
-       char    *dest,
-       char    *src,
-       int     len)
+       char            *dest,
+       const char      *src,
+       int             len)
 {
     int i = 0;
 
@@ -589,9 +584,8 @@ convert_mig_object_to_port(
 
                assert(previous == IP_NULL);
 
-               if (OSCompareAndSwap((UInt32)IP_NULL,
-                                     (UInt32)port,
-                                     (UInt32 *)&mig_object->port)) {
+               if (hw_compare_and_store((uint32_t)IP_NULL, (uint32_t)port,
+                                                                                       (uint32_t *)&mig_object->port)) {
                        deallocate = FALSE;
                } else {
                        ipc_port_dealloc_kernel(port);