From 13a3a306289f4eedd32220b3c335564f3a0a3772 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 29 May 2010 13:45:38 +0800 Subject: [PATCH] Fixed typo, cleaned up stuff --- Kernel/Makefile.BuildNum | 2 +- Kernel/arch/x86_64/errors.c | 1 + Kernel/arch/x86_64/link.ld | 7 +------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum index 42d69ad6..f95a7522 100644 --- a/Kernel/Makefile.BuildNum +++ b/Kernel/Makefile.BuildNum @@ -1 +1 @@ -BUILD_NUM = 2300 +BUILD_NUM = 2301 diff --git a/Kernel/arch/x86_64/errors.c b/Kernel/arch/x86_64/errors.c index 1c68b184..361ccb0e 100644 --- a/Kernel/arch/x86_64/errors.c +++ b/Kernel/arch/x86_64/errors.c @@ -63,6 +63,7 @@ void Error_Handler(tRegs *Regs) break; } + __asm__ __volatile__ ("cli"); for(;;) __asm__ __volatile__ ("hlt"); } diff --git a/Kernel/arch/x86_64/link.ld b/Kernel/arch/x86_64/link.ld index a1d9da70..451bb306 100644 --- a/Kernel/arch/x86_64/link.ld +++ b/Kernel/arch/x86_64/link.ld @@ -1,15 +1,10 @@ /* - * AcessMicro Kernel + * Acess2 x86_64 Kernel * Linker Script */ _kernel_base = 0xFFFF800000000000; -/* -lowStart = start - _kernel_base; -ENTRY(start) -OUTPUT_FORMAT(elf64-x86-64) -*/ OUTPUT_FORMAT(elf32-i386) OUTPUT_ARCH(i386:x86-64) ENTRY (start) -- 2.20.1