summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorrtm <rtm>2006-06-27 14:35:53 +0000
committerrtm <rtm>2006-06-27 14:35:53 +0000
commitc41f1de5d41a527a3fa2d1e94215766130eac456 (patch)
tree86f6a467be8b42aec42a05299789f39ace9cc5e2 /main.c
parentb61c2547b8b489cab16984c0940a1cb6593a2a3d (diff)
downloadxv6-labs-c41f1de5d41a527a3fa2d1e94215766130eac456.tar.gz
xv6-labs-c41f1de5d41a527a3fa2d1e94215766130eac456.tar.bz2
xv6-labs-c41f1de5d41a527a3fa2d1e94215766130eac456.zip
file descriptors
pipes
Diffstat (limited to 'main.c')
-rw-r--r--main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/main.c b/main.c
index 1226a8f..92b8f24 100644
--- a/main.c
+++ b/main.c
@@ -11,8 +11,8 @@
extern char edata[], end[];
extern int acpu;
-extern char _binary_user1_start[];
-extern char _binary_user1_size[];
+extern char _binary_user1_start[], _binary_user1_size[];
+extern char _binary_usertests_start[], _binary_usertests_size[];
char buf[512];
@@ -25,7 +25,7 @@ main()
cprintf("an application processor\n");
release_spinlock(&kernel_lock);
acquire_spinlock(&kernel_lock);
- idtinit();
+ idtinit(); // CPU's idt
lapic_init(cpu());
curproc[cpu()] = &proc[0]; // XXX
swtch();
@@ -70,7 +70,7 @@ main()
#if 1
p = newproc();
- load_icode(p, _binary_user1_start, (unsigned) _binary_user1_size);
+ load_icode(p, _binary_usertests_start, (unsigned) _binary_usertests_size);
#endif
#if 0