diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-14 10:55:22 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2015-02-14 10:55:22 -0500 |
| commit | ef4cc242dc8ad04320d19af22931fcbdbf670c13 (patch) | |
| tree | 50af19ff8e207870e2fdbad6d2a9ea669c901da8 /kernel/timer.c | |
| parent | ca1c4f58224404d4361e8ca16837e48c88c0ee38 (diff) | |
| download | kappa-ef4cc242dc8ad04320d19af22931fcbdbf670c13.zip kappa-ef4cc242dc8ad04320d19af22931fcbdbf670c13.tar.gz kappa-ef4cc242dc8ad04320d19af22931fcbdbf670c13.tar.bz2 kappa-ef4cc242dc8ad04320d19af22931fcbdbf670c13.tar.xz | |
Stuff
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index e1f248b..2c05167 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -34,5 +34,8 @@ void timer_delay(uint64_t ticks) { uint64_t end = *current_tick + ticks; while(*current_tick <= end) + { + asm("sti"); asm("hlt"); + } } |