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/facet_registry.cpp b/kernel/kapi/devices/facet_registry.cpp
index 2974c71e..f2f5d03b 100644
--- a/kernel/kapi/devices/facet_registry.cpp
+++ b/kernel/kapi/devices/facet_registry.cpp
@@ -46,7 +46,7 @@ namespace kapi::devices
   }
 
   auto facet_registry::do_publish(kstd::shared_ptr<device> device, kstd::string name, kapi::capabilities::facet_id id,
-                                  void * facet) -> kstd::result<void>
+                                  kstd::observer_ptr<void> facet) -> kstd::result<void>
   {
     auto published = std::optional<entry>{};
 
@@ -169,7 +169,7 @@ namespace kapi::devices
     return filtered;
   }
 
-  auto facet_registry::resolve(kapi::capabilities::facet_id facet, std::string_view name) -> void *
+  auto facet_registry::resolve(kapi::capabilities::facet_id facet, std::string_view name) -> kstd::observer_ptr<void>
   {
     auto found_device = kstd::shared_ptr<device>{};
     {
@@ -193,7 +193,7 @@ namespace kapi::devices
     return resolve(facet, *found_device);
   }
 
-  auto facet_registry::resolve(kapi::capabilities::facet_id id, device & device) -> void *
+  auto facet_registry::resolve(kapi::capabilities::facet_id id, device & device) -> kstd::observer_ptr<void>
   {
     if (auto by_device = device.facet(id))
     {