diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-09-19 23:20:44 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-09-19 23:20:44 +0200 |
commit | ec91b8ae6735a3f2977dc886ea63ff28e1aeef41 (patch) | |
tree | 67ac2a696cdd345b543d8415c74166bed11e9d4f /kern/task.c | |
parent | 9d952fb2d44ec2199a1d08999ff7a68aa26e9507 (diff) | |
parent | 45fcd2d09c15820e58e2334b80f7367d2f98ebb7 (diff) |
Merge branch 'master' into HEAD
Conflicts:
ChangeLog
kern/bootstrap.c
kern/debug.c
vm/vm_object.c
Diffstat (limited to 'kern/task.c')
-rw-r--r-- | kern/task.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kern/task.c b/kern/task.c index 45c59c59..88da16e8 100644 --- a/kern/task.c +++ b/kern/task.c @@ -116,7 +116,9 @@ kern_return_t task_create( { register task_t new_task; register processor_set_t pset; +#if FAST_TAS int i; +#endif new_task = (task_t) zalloc(task_zone); if (new_task == TASK_NULL) { |