stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

reduce obsolete lines and additional output messages

Browse source
This commit is contained in:
Stefan Lankes 2012-06-10 08:54:08 +02:00
parent be4cfaf413
commit 9d843a5e09
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/kernel/irq.c
View file

@ -232,8 +232,6 @@ int irq_init(void)
*/ */
size_t** irq_handler(struct state *s) size_t** irq_handler(struct state *s)
{ {
size_t** ret = NULL;
/* This is a blank function pointer */ /* This is a blank function pointer */
void (*handler) (struct state * s); void (*handler) (struct state * s);
@ -279,9 +277,9 @@ size_t** irq_handler(struct state *s)
leave_handler: leave_handler:
// timer interrupt? // timer interrupt?
if ((s->int_no == 32) || (s->int_no == 123)) if ((s->int_no == 32) || (s->int_no == 123))
ret = scheduler(); // switch to a new task return scheduler(); // switch to a new task
else if ((s->int_no >= 32) && (get_highest_priority() > per_core(current_task)->prio)) else if ((s->int_no >= 32) && (get_highest_priority() > per_core(current_task)->prio))
ret = scheduler(); return scheduler();
return ret; return NULL;
} }

4
mm/memory.c
View file

@ -181,8 +181,10 @@ int mmu_init(void)
atomic_int32_sub(&total_available_pages, 1); atomic_int32_sub(&total_available_pages, 1);
#endif #endif
ret = paging_init(); ret = paging_init();
if (ret) if (ret) {
kprintf("Failed to initialize paging: %d\n", ret);
return ret; return ret;
}
#ifdef CONFIG_MULTIBOOT #ifdef CONFIG_MULTIBOOT
/* /*