diff options
author | rtm <rtm> | 2006-07-11 17:39:45 +0000 |
---|---|---|
committer | rtm <rtm> | 2006-07-11 17:39:45 +0000 |
commit | b548df152b5a53ea8cfcb2d94fbdee07884d8050 (patch) | |
tree | b1eec270a0892fad7a256ae809ebedbbcfaeb720 /main.c | |
parent | 5ce9751cab960e3b226eb0720e781e793a0be4ed (diff) | |
download | xv6-labs-b548df152b5a53ea8cfcb2d94fbdee07884d8050.tar.gz xv6-labs-b548df152b5a53ea8cfcb2d94fbdee07884d8050.tar.bz2 xv6-labs-b548df152b5a53ea8cfcb2d94fbdee07884d8050.zip |
pre-empt both user and kernel, in clock interrupt
usertest.c tests pre-emption
kill()
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -66,11 +66,12 @@ main() ide_init(); // become interruptable - write_eflags(read_eflags() | FL_IF); + sti(); p = newproc(); - // load_icode(p, _binary_usertests_start, (unsigned) _binary_usertests_size); - load_icode(p, _binary_userfs_start, (unsigned) _binary_userfs_size); + + load_icode(p, _binary_usertests_start, (unsigned) _binary_usertests_size); + //load_icode(p, _binary_userfs_start, (unsigned) _binary_userfs_size); cprintf("loaded userfs\n"); scheduler(); |