[kernel] Don't double-construct the scheduler

The scheduler singleton was getting constructed twice, once at static
time and then again in main(). Make the singleton a pointer so we only
construct it once.
This commit is contained in:
2020-08-02 18:11:09 -07:00
parent cf582c4ce4
commit e1b1b5d357
3 changed files with 7 additions and 4 deletions

View File

@@ -73,7 +73,7 @@ public:
/// Get a reference to the system scheduler
/// \returns A reference to the global system scheduler
static scheduler & get() { return s_instance; }
static scheduler & get() { return *s_instance; }
private:
friend uintptr_t syscall_dispatch(uintptr_t, cpu_state &);
@@ -105,6 +105,6 @@ private:
uint64_t m_clock = 0;
uint64_t m_last_promotion;
static scheduler s_instance;
static scheduler *s_instance;
};