From 340557f5ab77ecc181aececdad741475e8424f55 Mon Sep 17 00:00:00 2001 From: Quinten Kock Date: Mon, 14 Dec 2020 23:08:36 +0100 Subject: [PATCH] remove info.nasm --- kernel/src/arch/x86_64/info.c | 3 +-- kernel/src/arch/x86_64/info.nasm | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 kernel/src/arch/x86_64/info.nasm diff --git a/kernel/src/arch/x86_64/info.c b/kernel/src/arch/x86_64/info.c index 686e883..f7105ba 100644 --- a/kernel/src/arch/x86_64/info.c +++ b/kernel/src/arch/x86_64/info.c @@ -1,3 +1,2 @@ - extern char archval; - const char *arch = &archval; + const char *arch = "x86_64"; diff --git a/kernel/src/arch/x86_64/info.nasm b/kernel/src/arch/x86_64/info.nasm deleted file mode 100644 index 963e001..0000000 --- a/kernel/src/arch/x86_64/info.nasm +++ /dev/null @@ -1,8 +0,0 @@ -%include "arch/x86_64/panic.nasminc" - -global archval -archval db "x86_64-nasm", 0 - -global asmpanic -asmpanic: - PANIC "asmpanic" \ No newline at end of file