Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

Merge branch 'devel' of github.com:RWTH-OS/HermitCore into devel

Browse source
This commit is contained in:
Stefan Lankes 2016-08-29 16:24:35 +02:00
commit d66454b0ee
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hermit/arch/x86/kernel/entry.asm
View file

@ -506,8 +506,8 @@ switch_context:
pushfq ; RFLAGS
push QWORD 0x08 ; CS
push QWORD rollback ; RIP
push QWORD 0x00 ; Interrupt number
push QWORD 0x00edbabe ; Error code
push QWORD 0x00 ; Interrupt number
push rax
push rcx
push rdx

2
hermit/kernel/tasks.c
View file

@ -766,7 +766,7 @@ void check_timers(void)
// check timers
current_tick = get_clock_tick();
while (readyqueues[core_id].timers.first && readyqueues[core_id].timers.first->timeout <= current_tick)
while (readyqueues[core_id].timers.first && readyqueues[core_id].timers.first->timeout >= current_tick)
{
task_t* task = readyqueues[core_id].timers.first;