From 1b02aebde2c9b804a030c00ecfc5040afa49193a Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 5 Feb 2020 21:32:08 -0700
Subject: [PATCH] Remove excess alignment
---
x86_64/disk.asm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/x86_64/disk.asm b/x86_64/disk.asm
index a47454a..19b949c 100644
--- a/x86_64/disk.asm
+++ b/x86_64/disk.asm
@@ -10,7 +10,7 @@ startup_start:
%ifdef ARCH_x86_64
%include "startup-x86_64.asm"
%endif
-align 512, db 0
+align BLOCK_SIZE, db 0
startup_end:
%ifdef KERNEL
@@ -18,14 +18,13 @@ startup_end:
%defstr KERNEL_STR %[KERNEL]
incbin KERNEL_STR
.end:
- align 512, db 0
-%else
align BLOCK_SIZE, db 0
+%else
%ifdef FILESYSTEM
filesystem:
%defstr FILESYSTEM_STR %[FILESYSTEM]
incbin FILESYSTEM_STR
- align BLOCK_SIZE, db 0
.end:
+ align BLOCK_SIZE, db 0
%endif
%endif
--
GitLab