summaryrefslogtreecommitdiff
path: root/ide.c
diff options
context:
space:
mode:
authorrtm <rtm>2006-08-08 19:58:06 +0000
committerrtm <rtm>2006-08-08 19:58:06 +0000
commit0e84a0ec6e7893dad13dff9a958c5bc987b79c82 (patch)
tree5739d0a2af8277db7a47c74e52975d9e9d81cef7 /ide.c
parente8d11c2e846ad15b32caacc8a919722b76d00f79 (diff)
downloadxv6-labs-0e84a0ec6e7893dad13dff9a958c5bc987b79c82.tar.gz
xv6-labs-0e84a0ec6e7893dad13dff9a958c5bc987b79c82.tar.bz2
xv6-labs-0e84a0ec6e7893dad13dff9a958c5bc987b79c82.zip
fix race in holding() check in acquire()
give cpu1 a TSS and gdt for when it enters scheduler() and a pseudo proc[] entry for each cpu cpu0 waits for each other cpu to start up read() for files
Diffstat (limited to 'ide.c')
-rw-r--r--ide.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ide.c b/ide.c
index d6bef6d..af509fc 100644
--- a/ide.c
+++ b/ide.c
@@ -51,14 +51,14 @@ ide_init(void)
}
ioapic_enable (14, 1); // 14 is IRQ # for IDE
ide_wait_ready(0);
- cprintf ("ide_init:done\n");
+ cprintf ("cpu%d: ide_init:done\n", cpu());
}
void
ide_intr(void)
{
acquire(&ide_lock);
- cprintf("%d: ide_intr\n", cpu());
+ cprintf("cpu%d: ide_intr\n", cpu());
wakeup(&request[tail]);
release(&ide_lock);
lapic_eoi();