Changeset 72

Timestamp:

Apr 17, 2014, 4:35:06 PM (9 years ago)

Author:

ertl-hiro

Message:

ASPカーネルの動的生成機能拡張パッケージに追従した修正。

Location:

asp_wo_cfg/trunk/kernel

Files:

• mempfix.c (modified) (1 diff)
• task_manage.c (modified) (2 diffs)

asp_wo_cfg/trunk/kernel/mempfix.c

@@ -213 +213 @@
         else {
                 if (mpf == NULL) {
-                        mpf = kernel_malloc(pk_cmpf->blkcnt * ROUND_MPF_T(pk_cmpf->blksz));
+                        mpf = kernel_malloc(ROUND_MPF_T(pk_cmpf->blksz) * pk_cmpf->blkcnt);
                 }
                 if (mpf == NULL) {

asp_wo_cfg/trunk/kernel/task_manage.c

@@ -147 +147 @@
         CHECK_TPRI(pk_ctsk->itskpri);
         CHECK_STKSZ_MIN(pk_ctsk->stksz);
-        CHECK_ALIGN_STKSZ(pk_ctsk->stksz);
         if (pk_ctsk->stk != NULL) {
+                CHECK_ALIGN_STKSZ(pk_ctsk->stksz);
                 CHECK_ALIGN_STACK(pk_ctsk->stk);
         }
@@ -160 +160 @@
         else if ((ercd = target_check_ctsk(tskid, pk_ctsk)) == E_OK) {
                 if (stk == NULL) {
-                        stk = kernel_malloc(pk_ctsk->stksz);
+                        stk = kernel_malloc(ROUND_STK_T(pk_ctsk->stksz));
                 }
                 if (stk == NULL) {