Force Display instance pointer to BSS

djphoenix · Nov 19, 2016 · 446c404 · 446c404
1 parent bd2f0be
commit 446c404
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/kernlib/display.cpp b/src/kernlib/display.cpp
@@ -190,10 +190,14 @@ char *const ConsoleDisplay::base = reinterpret_cast<char*>(0xB8000);
 char *const ConsoleDisplay::top = reinterpret_cast<char*>(0xB8FA0);
 const size_t ConsoleDisplay::size = ConsoleDisplay::top - ConsoleDisplay::base;
 
+static Display *getSerialDisplay();
+
 static SerialDisplay serialConsole;
-Display *Display::instance = &serialConsole;
+Display *Display::instance = getSerialDisplay();
 Mutex Display::instanceMutex;
 
+static Display *getSerialDisplay() { return &serialConsole; }
+
 void Display::setup() {
   if (instance != &serialConsole) return;
   const EFI_SYSTEM_TABLE *ST = EFI::getSystemTable();