xnu-4903.221.2.tar.gz

[apple/xnu.git] / osfmk / arm / locks.h

diff --git a/osfmk/arm/locks.h b/osfmk/arm/locks.h
index 3a58a7fccea1f5fa9a6f9ba7f4d0e77a2506f40b..16acddb90ed12ec989a9b0457dd152ed70f0a86a 100644 (file)
--- a/osfmk/arm/locks.h
+++ b/osfmk/arm/locks.h
@@ -255,8 +255,6 @@ typedef struct {
 
 #define LOCK_PANIC_TIMEOUT     0xc00000        // 12.5 m ticks = 250ms with 24MHz OSC
 
 
 #define LOCK_PANIC_TIMEOUT     0xc00000        // 12.5 m ticks = 250ms with 24MHz OSC
 

-#define LOCK_TRY_DISABLE_INT 1 // Disable interrupts for a quick acquire attempt
-

 #define PLATFORM_LCK_ILOCK LCK_ILOCK
 
 
 #define PLATFORM_LCK_ILOCK LCK_ILOCK
 
 


@@ -276,6 +274,7 @@ typedef struct {
 #define LCK_MTX_THREAD_MASK (~(uintptr_t)(LCK_ILOCK | ARM_LCK_WAITERS))
 
 #define disable_preemption_for_thread(t) ((volatile thread_t)t)->machine.preemption_count++
 #define LCK_MTX_THREAD_MASK (~(uintptr_t)(LCK_ILOCK | ARM_LCK_WAITERS))
 
 #define disable_preemption_for_thread(t) ((volatile thread_t)t)->machine.preemption_count++

+#define preemption_disabled_for_thread(t) (((volatile thread_t)t)->machine.preemption_count > 0)

 
 
 __unused static void disable_interrupts_noread(void)
 
 
 __unused static void disable_interrupts_noread(void)