diff options
| author | bernard <[email protected]> | 2014-04-20 10:10:37 +0800 |
|---|---|---|
| committer | bernard <[email protected]> | 2014-04-20 10:10:37 +0800 |
| commit | e07f4033ba91c71cee647d7e44429bebe8e9fa4f (patch) | |
| tree | 6c7d93de27c92f5d2e9acfe2d98f2a670161ce93 | |
| parent | bd2b9c54bdbd1cf6b6d95700bc2dd2d537c4eb12 (diff) | |
| parent | 30d477a9f8dfe2ef431028a8f2956ab2977f308e (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
| -rw-r--r-- | bsp/taihu/taihu.lds | 2 | ||||
| -rw-r--r-- | src/mempool.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bsp/taihu/taihu.lds b/bsp/taihu/taihu.lds index 7b4eae28bd..75e2cf762f 100644 --- a/bsp/taihu/taihu.lds +++ b/bsp/taihu/taihu.lds @@ -36,7 +36,7 @@ SECTIONS .text : { - KEEP(build/libcpu/ppc/ppc405/start_gcc.o (.text)) + KEEP(build/kernel/libcpu/ppc/ppc405/start_gcc.o (.text)) *(.text) *(.fixup) diff --git a/src/mempool.c b/src/mempool.c index c9bcd7a45c..05904bfbc7 100644 --- a/src/mempool.c +++ b/src/mempool.c @@ -356,6 +356,8 @@ void *rt_mp_alloc(rt_mp_t mp, rt_int32_t time) /* get current thread */ thread = rt_thread_self(); + thread->error = RT_EOK; + /* need suspend thread */ rt_thread_suspend(thread); rt_list_insert_after(&(mp->suspend_thread), &(thread->tlist)); |