diff options
| author | Fabian Imhof <fabian.imhof@ost.ch> | 2025-04-10 09:32:53 +0000 |
|---|---|---|
| committer | Fabian Imhof <fabian.imhof@ost.ch> | 2025-04-10 09:32:53 +0000 |
| commit | becafcadcea919b84029338983a453d06ef210a1 (patch) | |
| tree | fb246528e288ad74f4bb007118dffe9d3b923dac /arch/x86_64/src/kernel/main.cpp | |
| parent | 295f1bc9a29267b72504fffb582a08c2467b1a7f (diff) | |
| parent | c2d22838c0500970f275069f19d2a0bd2a016d1b (diff) | |
| download | teachos-becafcadcea919b84029338983a453d06ef210a1.tar.xz teachos-becafcadcea919b84029338983a453d06ef210a1.zip | |
Merge branch 'feat_inital_context_switching' of ssh://gitlab.ost.ch:45022/teachos/kernel into feat_inital_context_switching
Diffstat (limited to 'arch/x86_64/src/kernel/main.cpp')
| -rw-r--r-- | arch/x86_64/src/kernel/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp index 7787f30..daaf216 100644 --- a/arch/x86_64/src/kernel/main.cpp +++ b/arch/x86_64/src/kernel/main.cpp @@ -66,7 +66,7 @@ namespace teachos::arch::kernel "mov %%ax, %%gs" : /* No output from call */ : [input] "m"(segment_selector_b)); - asm volatile("iret" + asm volatile("iretq" : /* No output from call */ : /* No input to call */); } @@ -74,7 +74,7 @@ namespace teachos::arch::kernel [[gnu::naked]] auto iret() -> void { - asm volatile("iret" + asm volatile("iretq" : /* No output from call */ : /* No input to call */); } |