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/priority.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/priority.c')
| -rw-r--r-- | kern/priority.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kern/priority.c b/kern/priority.c index 43d61010..feddd8ee 100644 --- a/kern/priority.c +++ b/kern/priority.c @@ -41,6 +41,7 @@ #include <kern/mach_clock.h> #include <kern/mach_param.h> #include <kern/sched.h> +#include <kern/sched_prim.h> #include <kern/thread.h> #include <kern/processor.h> #include <kern/timer.h> |