tcb_alloc_init of l4lib was clashing with mm0 definitions.

This commit is contained in:
Bahadir Balban
2009-11-23 12:59:33 +02:00
parent e28e54fa7b
commit e690949b3b
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -36,7 +36,7 @@ struct global_list {
}; };
struct tcb *find_task(int tid); struct tcb *find_task(int tid);
struct tcb *tcb_alloc_init(struct tcb *parent, unsigned int flags); struct tcb *l4_tcb_alloc_init(struct tcb *parent, unsigned int flags);
void global_add_task(struct tcb *task); void global_add_task(struct tcb *task);
void global_remove_task(struct tcb *task); void global_remove_task(struct tcb *task);
+1 -1
View File
@@ -41,7 +41,7 @@ struct tcb *find_task(int tid)
return 0; return 0;
} }
struct tcb *tcb_alloc_init(struct tcb *parent, unsigned int flags) struct tcb *l4_tcb_alloc_init(struct tcb *parent, unsigned int flags)
{ {
struct tcb *task; struct tcb *task;
+1 -1
View File
@@ -50,7 +50,7 @@ int l4_thread_create(struct task_ids *ids, unsigned int flags,
} }
/* Allocate tcb for the child. */ /* Allocate tcb for the child. */
if (!(child = tcb_alloc_init(parent, flags))) { if (!(child = l4_tcb_alloc_init(parent, flags))) {
// FIXME: What happens to utcb_head // FIXME: What happens to utcb_head
printf("libl4thread: No heap space left.\n"); printf("libl4thread: No heap space left.\n");
err = -ENOMEM; err = -ENOMEM;
+1 -1
View File
@@ -77,7 +77,7 @@ static int set_utcb_addr(void)
int err; int err;
/* Create a task. */ /* Create a task. */
if (IS_ERR(task = tcb_alloc_init(0, 0))) if (IS_ERR(task = l4_tcb_alloc_init(0, 0)))
return -ENOMEM; return -ENOMEM;
/* Add child to the global task list. */ /* Add child to the global task list. */