Browse Source

Merge branch 'master' of https://github.com/RT-Thread/rt-thread

bernard 11 years ago
parent
commit
e07f4033ba
2 changed files with 3 additions and 1 deletions
  1. 1 1
      bsp/taihu/taihu.lds
  2. 2 0
      src/mempool.c

+ 1 - 1
bsp/taihu/taihu.lds

@@ -36,7 +36,7 @@ SECTIONS
 
 
   .text      :
   .text      :
   {
   {
-    KEEP(build/libcpu/ppc/ppc405/start_gcc.o (.text))
+    KEEP(build/kernel/libcpu/ppc/ppc405/start_gcc.o (.text))
 
 
     *(.text)
     *(.text)
     *(.fixup)
     *(.fixup)

+ 2 - 0
src/mempool.c

@@ -356,6 +356,8 @@ void *rt_mp_alloc(rt_mp_t mp, rt_int32_t time)
             /* get current thread */
             /* get current thread */
             thread = rt_thread_self();
             thread = rt_thread_self();
 
 
+            thread->error = RT_EOK;
+
             /* need suspend thread */
             /* need suspend thread */
             rt_thread_suspend(thread);
             rt_thread_suspend(thread);
             rt_list_insert_after(&(mp->suspend_thread), &(thread->tlist));
             rt_list_insert_after(&(mp->suspend_thread), &(thread->tlist));