1 files changed, 20 insertions, 0 deletions

diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp
index 2d3da9d66..599d05947 100644
--- a/src/core/hle/kernel/k_thread.cpp
+++ b/src/core/hle/kernel/k_thread.cpp
@@ -29,6 +29,7 @@
 #include "core/hle/kernel/k_thread_queue.h"
 #include "core/hle/kernel/k_worker_task_manager.h"
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/svc.h"
 #include "core/hle/kernel/svc_results.h"
 #include "core/hle/kernel/svc_types.h"
 #include "core/hle/result.h"
@@ -298,6 +299,25 @@ Result KThread::InitializeUserThread(Core::System& system, KThread* thread, KThr
                               ThreadType::User, system.GetCpuManager().GetGuestThreadFunc()));
 }
 
+Result KThread::InitializeServiceThread(Core::System& system, KThread* thread,
+                                        std::function<void()>&& func, s32 prio, s32 virt_core,
+                                        KProcess* owner) {
+    system.Kernel().GlobalSchedulerContext().AddThread(thread);
+    std::function<void()> func2{[&system, func{std::move(func)}] {
+        // Similar to UserModeThreadStarter.
+        system.Kernel().CurrentScheduler()->OnThreadStart();
+
+        // Run the guest function.
+        func();
+
+        // Exit.
+        Svc::ExitThread(system);
+    }};
+
+    R_RETURN(InitializeThread(thread, {}, {}, {}, prio, virt_core, owner, ThreadType::HighPriority,
+                              std::move(func2)));
+}
+
 void KThread::PostDestroy(uintptr_t arg) {
     KProcess* owner = reinterpret_cast<KProcess*>(arg & ~1ULL);
     const bool resource_limit_release_hint = (arg & 1);