summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorrtm <rtm>2006-07-11 17:39:45 +0000
committerrtm <rtm>2006-07-11 17:39:45 +0000
commitb548df152b5a53ea8cfcb2d94fbdee07884d8050 (patch)
treeb1eec270a0892fad7a256ae809ebedbbcfaeb720 /main.c
parent5ce9751cab960e3b226eb0720e781e793a0be4ed (diff)
downloadxv6-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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/main.c b/main.c
index b711640..ce29af3 100644
--- a/main.c
+++ b/main.c
@@ -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();