Merge branch 'fmorgner/x86-64-double-fault-handling' into 'develop'

x86_64: handle double faults

See merge request teachos/kernel!59

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/kapi/devices/bus.cpp b/kernel/kapi/devices/bus.cpp
index 300151d5..d956c3b8 100644
--- a/kernel/kapi/devices/bus.cpp
+++ b/kernel/kapi/devices/bus.cpp
@@ -84,15 +84,15 @@ namespace kapi::devices
     return m_devices;
   }
 
-  auto bus::query_facet(kapi::capabilities::facet_id facet) -> void *
+  auto bus::query_facet(kapi::capabilities::facet_id facet) -> kstd::observer_ptr<void>
   {
     if (facet == bus::id)
     {
-      return this;
+      return kstd::observer_ptr(this);
     }
     else if (facet == bus_protocol::id)
     {
-      return m_protocol;
+      return kstd::observer_ptr{m_protocol};
     }
 
     return device::query_facet(facet);