diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2023-04-28 17:27:24 +0200 |
|---|---|---|
| committer | Jelle Raaijmakers <jelle@gmta.nl> | 2023-04-28 23:24:19 +0200 |
| commit | 9ab598af4984c0590358123af630e0e65e310b72 (patch) | |
| tree | a639e1f19e8da87bd42bbe151d9e954dd98e194b /Kernel/Arch/x86_64/linker.ld | |
| parent | a8d08357c9e9eaa6f23a0179a26b8bf0cf52fc02 (diff) | |
| download | serenity-9ab598af4984c0590358123af630e0e65e310b72.zip | |
Revert "Kernel/x86: Bake the Prekernel and the Kernel into one image"
Some hardware/software configurations crash KVM as soon as we try to
start Serenity. The exact cause is currently unknown, so just fully
revert it for now.
This reverts commit 897c4e5145474d55b247a4a3b5e6bf5420279e2f.
Diffstat (limited to 'Kernel/Arch/x86_64/linker.ld')
| -rw-r--r-- | Kernel/Arch/x86_64/linker.ld | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Kernel/Arch/x86_64/linker.ld b/Kernel/Arch/x86_64/linker.ld index e9b7a870f1..e11648fe13 100644 --- a/Kernel/Arch/x86_64/linker.ld +++ b/Kernel/Arch/x86_64/linker.ld @@ -69,8 +69,6 @@ SECTIONS start_of_kernel_data = .; *(.data*) end_of_kernel_data = .; - . = ALIGN(4K); - *(.heap) } :data .ro_after_init ALIGN(4K) : AT(ADDR(.ro_after_init)) @@ -87,6 +85,9 @@ SECTIONS *(COMMON) *(.bss*) end_of_kernel_bss = .; + + . = ALIGN(4K); + *(.heap) } :bss .dynamic ALIGN(4K) : AT (ADDR(.dynamic)) |