xnu-1699.24.23.tar.gz

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

diff --git a/osfmk/i386/simple_lock.h b/osfmk/i386/simple_lock.h
index e823308c9f640e8cb722687bc3fbb6664a12f001..563c17739a5b0c2cfd46f0cca4d7c39de9547bcc 100644 (file)
--- a/osfmk/i386/simple_lock.h
+++ b/osfmk/i386/simple_lock.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 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,
- * 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@
@@ -66,9 +72,6 @@
 #if defined(MACH_KERNEL_PRIVATE) && defined(__APPLE_API_PRIVATE)
 #include <i386/hw_lock_types.h>
 #include <mach_ldebug.h>
-#endif
-
-#if defined(MACH_KERNEL_PRIVATE) && defined(__APPLE_API_PRIVATE)
 
 #if    MACH_LDEBUG
 #define        USLOCK_DEBUG 1
@@ -79,19 +82,21 @@
 typedef struct uslock_debug {
        void                    *lock_pc;       /* pc where lock operation began    */
        void                    *lock_thread;   /* thread that acquired lock */
+       void                    *unlock_thread; /* last thread to release lock */
+       void                    *unlock_pc;     /* pc where lock operation ended    */
        unsigned long   duration[2];
        unsigned short  state;
        unsigned char   lock_cpu;
-       void                    *unlock_thread; /* last thread to release lock */
        unsigned char   unlock_cpu;
-       void                    *unlock_pc;     /* pc where lock operation ended    */
 } uslock_debug;
 
 typedef struct slock {
        hw_lock_data_t  interlock;      /* must be first... see lock.c */
+#if    USLOCK_DEBUG
        unsigned short  lock_type;      /* must be second... see lock.c */
 #define USLOCK_TAG     0x5353
        uslock_debug    debug;
+#endif
 } usimple_lock_data_t, *usimple_lock_t;
 
 extern void                    i386_lock_unlock_with_flush(
@@ -99,7 +104,7 @@ extern void                  i386_lock_unlock_with_flush(
 #else
 
 typedef        struct slock {
-       unsigned int    lock_data[10];
+       unsigned long   lock_data[10];
 } usimple_lock_data_t, *usimple_lock_t;
 
 #endif /* defined(MACH_KERNEL_PRIVATE) && defined(__APPLE_API_PRIVATE) */