diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-02-19 00:09:08 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-02-19 00:09:08 +0000 |
| commit | 70bb128ae9b92c23480cd40fa90805eedd0db4bc (patch) | |
| tree | 411f39311c375fb5c071cafee3db783dca32c42c /firmware/thread.c | |
| parent | 8bc2801e7cb78be60967fefa96a71d4e91761630 (diff) | |
| download | rockbox-70bb128ae9b92c23480cd40fa90805eedd0db4bc.tar.gz rockbox-70bb128ae9b92c23480cd40fa90805eedd0db4bc.zip | |
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
Diffstat (limited to 'firmware/thread.c')
| -rw-r--r-- | firmware/thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 967 | * life again. */ | 967 | * life again. */ |
| 968 | if (state == STATE_BLOCKED_W_TMO) | 968 | if (state == STATE_BLOCKED_W_TMO) |
| 969 | { | 969 | { |
| 970 | #if NUM_CORES > 1 | 970 | #ifdef HAVE_CORELOCK_OBJECT |
| 971 | /* Lock the waiting thread's kernel object */ | 971 | /* Lock the waiting thread's kernel object */ |
| 972 | struct corelock *ocl = curr->obj_cl; | 972 | struct corelock *ocl = curr->obj_cl; |
| 973 | 973 | ||
| @@ -1782,7 +1782,7 @@ void thread_exit(void) | |||
| 1782 | */ | 1782 | */ |
| 1783 | void remove_thread(unsigned int thread_id) | 1783 | void remove_thread(unsigned int thread_id) |
| 1784 | { | 1784 | { |
| 1785 | #if NUM_CORES > 1 | 1785 | #ifdef HAVE_CORELOCK_OBJECT |
| 1786 | /* core is not constant here because of core switching */ | 1786 | /* core is not constant here because of core switching */ |
| 1787 | unsigned int core = CURRENT_CORE; | 1787 | unsigned int core = CURRENT_CORE; |
| 1788 | unsigned int old_core = NUM_CORES; | 1788 | unsigned int old_core = NUM_CORES; |