summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gianforcaro <bgianf@serenityos.org>2023-04-08 15:25:45 -0700
committerBrian Gianforcaro <b.gianfo@gmail.com>2023-04-08 19:16:35 -0700
commite891f13c844906d5fb3fd6269263f286b0a41dcb (patch)
tree0049d93e84600ed889f83c1202b06bd0e749a04f
parent56fdbf81dc14dbbd0a661329f1a507562d8d7b1f (diff)
downloadserenity-e891f13c844906d5fb3fd6269263f286b0a41dcb.zip
Kernel: Fix compilation of aarch64/RPi/Framebuffer.cpp
The definitions were being defined already by `BootInfo.h` and that was being included here via transitive includes. The extern definitions of the variables do not have the `READONLY_AFTER_INIT` attribute in `BootInfo.h`. This causes conflicting definitions of the same variable. The `READONLY_AFTER_INIT` specifier is not needed for extern variables as it only effects their linkage, not their actual use, so just use the versions in `BootInfo.h` instead of re-declaring.
-rw-r--r--Kernel/Arch/aarch64/RPi/Framebuffer.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/Kernel/Arch/aarch64/RPi/Framebuffer.cpp b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
index 4baa95e3df..f38586e316 100644
--- a/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
+++ b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
@@ -8,13 +8,9 @@
#include <Kernel/Arch/aarch64/BootPPMParser.h>
#include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
#include <Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h>
+#include <Kernel/BootInfo.h>
#include <Kernel/Sections.h>
-extern READONLY_AFTER_INIT PhysicalAddress multiboot_framebuffer_addr;
-extern READONLY_AFTER_INIT u32 multiboot_framebuffer_pitch;
-extern READONLY_AFTER_INIT u32 multiboot_framebuffer_width;
-extern READONLY_AFTER_INIT u32 multiboot_framebuffer_height;
-extern READONLY_AFTER_INIT u8 multiboot_framebuffer_type;
extern const u32 serenity_boot_logo_start;
extern const u32 serenity_boot_logo_size;