Rename main0 to main.

diff --git a/Makefile b/Makefile
index 31bc94638dc34c1880864ca3bdd026adac602a38..cde81e59f907fc330ad7132cfc7c068392e20315 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ kernel : $(OBJS) bootother.S initcode.S
        $(LD) -N -e start -Ttext 0 -o initcode.out initcode.o
        $(OBJCOPY) -S -O binary initcode.out initcode
        $(OBJDUMP) -S initcode.o > initcode.asm
-       $(LD) -Ttext 0x100000 -e main0 -o kernel $(OBJS) -b binary initcode bootother
+       $(LD) -Ttext 0x100000 -e main -o kernel $(OBJS) -b binary initcode bootother
        $(OBJDUMP) -S kernel > kernel.asm
        $(OBJDUMP) -t kernel | awk '/SYMBOL TABLE/ { go=1; next } go {print $$1, $$NF}' >kernel.sym
 

diff --git a/defs.h b/defs.h
index 8c4c6651f0159e8bb517e74ad79c7d5271dfc7d8..7ed89efeb48f9701e376026a19190a80e5908de7 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -102,7 +102,7 @@ void            proc_exit(void);
 int             proc_kill(int);
 int             proc_wait(void);
 void            procdump(void);
-void            scheduler(void);
+void            scheduler(void) __attribute__((noreturn));
 void            setupsegs(struct proc*);
 void            sleep(void*, struct spinlock*);
 void            userinit(void);

diff --git a/initcode.S b/initcode.S
index 3b41c6e7c0fefbab1ae11c6a1cd39cda5d4983b2..984d29fdc25d53faa40f0ad5a2f54d3d090f4c43 100644 (file)
--- a/initcode.S
+++ b/initcode.S
@@ -4,6 +4,7 @@
 #include "traps.h"
 
 # exec(init, argv)
+.globl start
 start:
   pushl $argv
   pushl $init

diff --git a/main.c b/main.c
index 570c164e980cf1ca8e32e45db5a8311c726304ac..3508ecc92f0e0ac3f71e2359595873808e327d4b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -10,8 +10,8 @@ extern char edata[], end[];
 void bootothers(void);
 
 // Bootstrap processor starts running C code here.
-void
-main0(void)
+int
+main(void)
 {
   int i;
   static volatile int bcpu;  // cannot be on stack