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/thread.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/thread.c')
| -rw-r--r-- | kern/thread.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kern/thread.c b/kern/thread.c index 71f222ce..1548e143 100644 --- a/kern/thread.c +++ b/kern/thread.c @@ -42,12 +42,15 @@ #include <kern/ast.h> #include <kern/counters.h> #include <kern/debug.h> +#include <kern/eventcount.h> +#include <kern/ipc_mig.h> #include <kern/ipc_tt.h> #include <kern/mach_param.h> #include <kern/processor.h> #include <kern/queue.h> #include <kern/sched.h> #include <kern/sched_prim.h> +#include <kern/syscall_subr.h> #include <kern/thread.h> #include <kern/thread_swap.h> #include <kern/host.h> @@ -696,7 +699,7 @@ void thread_deallocate( * Clean up any machine-dependent resources. */ if ((thread->state & TH_SWAPPED) == 0) { - spl_t _s_ = splsched(); + splsched(); stack_free(thread); (void) splx(s); thread_deallocate_stack++; |