Oops made a mistake that messed up test_and_set selection.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15139 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 3 deletions

diff --git a/firmware/export/thread.h b/firmware/export/thread.h
index 20cde1a8e3..89eb65184a 100644
--- a/firmware/export/thread.h
+++ b/firmware/export/thread.h
@@ -339,7 +339,7 @@ struct core_entry
 /* Macros generate better code than an inline function is this case */
 #if (defined (CPU_PP) || defined (CPU_ARM))
 /* atomic */
-#ifdef SOFTWARE_CORELOCK
+#if CONFIG_CORELOCK == SW_CORELOCK
 #define test_and_set(a, v, cl) \
     xchg8((a), (v), (cl))
 /* atomic */
@@ -364,7 +364,7 @@ struct core_entry
     *(a) = (v);          \
     corelock_unlock(cl); \
     o; })
-#else
+#elif CONFIG_CORELOCK == CORELOCK_SWAP
 /* atomic */
 #define test_and_set(a, v, ...) \
     xchg8((a), (v))
@@ -393,7 +393,7 @@ struct core_entry
         : "=r"(o)           \
         : "r"(v), "r"(a));  \
     o; })
-#endif /* SOFTWARE_CORELOCK */
+#endif /* locking selection */
 #elif defined (CPU_COLDFIRE)
 /* atomic */
 /* one branch will be optimized away if v is a constant expression */