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

Merge branch 'master' into ohligs

Browse source 
Conflicts:
	kernel/tests.c
This commit is contained in:
Marian Ohligs 2011-08-02 16:00:11 +02:00
commit 53d3b0e45d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/mm/page.c
View file

@ -611,10 +611,11 @@ static void pagefault_handler(struct state *s)
}
default_handler:
kprintf("PAGE FAULT: Task %u got page fault at %p (irq %d)\n", task->id, viraddr, s->int_no);
kprintf("PAGE FAULT: Task %u got page fault at %p (irq %d, cs:eip 0x%x:0x%x)\n", task->id, viraddr, s->int_no, s->cs, s->eip);
kprintf("Register state: eax = 0x%x, ebx = 0x%x, ecx = 0x%x, edx = 0x%x, edi = 0x%x, esi = 0x%x, ebp = 0x%x, esp = 0x%x\n",
s->eax, s->ebx, s->ecx, s->edx, s->edi, s->esi, s->ebp, s->esp);
irq_enable();
abort();
}

4
kernel/tests.c
View file

@ -250,9 +250,7 @@ int test_init(void)
//sem_init(&consuming, 0);
//mailbox_int32_init(&mbox);
//create_kernel_task(NULL, foo, "Hello from foo1\n");
//create_kernel_task(NULL, join_test, NULL);
#if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
#if 0 //defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
if (!RCCE_ue())
create_kernel_task(NULL,server_task,NULL);
else