From 910a493e215b0d6f6bd82004673d657e1df18ec0 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 18 Aug 2016 19:44:31 -0600
Subject: [PATCH] Add syscall handler, still work in progress Add elf files

---
 x86/harddrive.asm | 2 --
 x86/kernel.ld     | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/x86/harddrive.asm b/x86/harddrive.asm
index 3adda0d3ee..2a50fed6a2 100644
--- a/x86/harddrive.asm
+++ b/x86/harddrive.asm
@@ -17,5 +17,3 @@ kernel_file:
 .end:
 .length equ kernel_file.end - kernel_file
 .length_sectors equ .length / 512
-
-times 1024*1024-($-$$) db 0
diff --git a/x86/kernel.ld b/x86/kernel.ld
index 09d99583bb..c81df10dc7 100644
--- a/x86/kernel.ld
+++ b/x86/kernel.ld
@@ -1,16 +1,14 @@
 ENTRY(kstart)
 OUTPUT_FORMAT(elf64-x86-64)
 
-KERNEL_OFFSET = 0;
+KERNEL_OFFSET = 0x100000;
 
 SECTIONS {
-    . = 0x100000;
+    . = KERNEL_OFFSET;
 
     . += SIZEOF_HEADERS;
     . = ALIGN(4096);
 
-	. += KERNEL_OFFSET;
-
     .text : AT(ADDR(.text) - KERNEL_OFFSET) {
         __text_start = .;
         *(.text*)