fix gdtr idtr

diff --git a/.gitignore b/.gitignore
index 67abe4365d00d85739d700176892d8a78d5ac8a5..d312213ae8592497be8f15358f0c7c1411278f1b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ bin/hello
 bin/shell
 a.*
 snapshot.txt
+*.lock

diff --git a/include/system.h b/include/system.h
index c72fb0f7e8dedeb15cdcadbce0537737c84a84dc..ea8dbf659a24a8c449b82b84584598266e132aa5 100644 (file)
--- a/include/system.h
+++ b/include/system.h
@@ -67,7 +67,7 @@ void    kfree(void *addr);
 
 extern char etext, edata, end;
 
-char gdtr[6],idtr[6];
+extern char gdtr[6],idtr[6];
 #define lgdt()    __asm__    __volatile__("lgdt gdtr")
 #define sgdt()    __asm__    __volatile__("sgdt gdtr")
 #define lidt()    __asm__    __volatile__("lidt idtr")

diff --git a/kernel/system.c b/kernel/system.c
index 7035db0edf3d65bcde7c74a529249a6587e31311..257967770ddd4ebdf470e29250edb2af0d01857e 100644 (file)
--- a/kernel/system.c
+++ b/kernel/system.c
@@ -187,3 +187,6 @@ void system_delay()
     }
     irq_restore(flags);
 }
+
+
+char gdtr[6],idtr[6];

diff --git a/scripts/init.sh b/scripts/init.sh
index 65dc7a2c9aa517ab5bc76de396b37a391e78df91..d44e3bd9e80838dc65b2ad9ebe8304969ec24c87 100755 (executable)
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -5,6 +5,8 @@ HDIMG=out.img
 TMP=build/tmp
 MNT=$TMP/mnt
 
+mkdir -p ${MNT}
+
 
 # 生成硬盘
 dd if=/dev/zero of=$HDIMG bs=512 count=24576