From 70bb128ae9b92c23480cd40fa90805eedd0db4bc Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sat, 19 Feb 2011 00:09:08 +0000 Subject: Cleanup preprocessor around corelock usage and move its definition outside #ifdef ASSEMBLER_THREADS git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29330 a1c6a512-1295-4272-9138-f99709370657 --- firmware/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/thread.c') diff --git a/firmware/thread.c b/firmware/thread.c index bfbaf462a6..ea73150853 100644 --- a/firmware/thread.c +++ b/firmware/thread.c @@ -967,7 +967,7 @@ void check_tmo_threads(void) * life again. */ if (state == STATE_BLOCKED_W_TMO) { -#if NUM_CORES > 1 +#ifdef HAVE_CORELOCK_OBJECT /* Lock the waiting thread's kernel object */ struct corelock *ocl = curr->obj_cl; @@ -1782,7 +1782,7 @@ void thread_exit(void) */ void remove_thread(unsigned int thread_id) { -#if NUM_CORES > 1 +#ifdef HAVE_CORELOCK_OBJECT /* core is not constant here because of core switching */ unsigned int core = CURRENT_CORE; unsigned int old_core = NUM_CORES; -- cgit v1.2.3