diff --git a/Kernel/Process.h b/Kernel/Process.h index 39808bd614..79bc2b0126 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -390,11 +390,6 @@ public: int exec(String path, Vector arguments, Vector environment, int recusion_depth = 0); - enum class ShouldAllocateTls { - No = 0, - Yes, - }; - KResultOr load(NonnullRefPtr main_program_description, RefPtr interpreter_description, const Elf32_Ehdr& main_program_header); KResultOr get_interpreter_load_offset(const Elf32_Ehdr& main_program_header, FileDescription& main_program_description, FileDescription& interpreter_description); diff --git a/Kernel/Syscalls/execve.cpp b/Kernel/Syscalls/execve.cpp index 179c25f497..4d55e5c8bc 100644 --- a/Kernel/Syscalls/execve.cpp +++ b/Kernel/Syscalls/execve.cpp @@ -155,7 +155,12 @@ static KResultOr make_userspace_stack_for_main_thread(Region& region, V return new_esp; } -static KResultOr load_elf_object(NonnullOwnPtr new_space, FileDescription& object_description, FlatPtr load_offset, Process::ShouldAllocateTls should_allocate_tls) +enum class ShouldAllocateTls { + No, + Yes, +}; + +static KResultOr load_elf_object(NonnullOwnPtr new_space, FileDescription& object_description, FlatPtr load_offset, ShouldAllocateTls should_allocate_tls) { auto& inode = *(object_description.inode()); auto vmobject = SharedInodeVMObject::create_with_inode(inode); @@ -190,7 +195,7 @@ static KResultOr load_elf_object(NonnullOwnPtr new_space, Fil KResult ph_load_result = KSuccess; elf_image.for_each_program_header([&](const ELF::Image::ProgramHeader& program_header) { if (program_header.type() == PT_TLS) { - ASSERT(should_allocate_tls == Process::ShouldAllocateTls::Yes); + ASSERT(should_allocate_tls == ShouldAllocateTls::Yes); ASSERT(program_header.size_in_memory()); if (!elf_image.is_within_image(program_header.raw_data(), program_header.size_in_image())) {