From ff27e3d5ca61fb6234b0876dc3368d0e5dfc5a95 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 6 Dec 2014 18:39:12 +0100 Subject: Trying to track an annoying bug. --- kernel/include/idt.h | 2 ++ kernel/include/slab_alloc.h | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'kernel/include') diff --git a/kernel/include/idt.h b/kernel/include/idt.h index ba344c9..e054ed5 100644 --- a/kernel/include/idt.h +++ b/kernel/include/idt.h @@ -88,4 +88,6 @@ void idt_init(); void idt_set_ex_handler(int number, isr_handler_t func); //Set exception handler void idt_set_irq_handler(int number, isr_handler_t func); //Set IRQ handler +void dbg_dump_registers(registers_t*); + /* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/kernel/include/slab_alloc.h b/kernel/include/slab_alloc.h index 5c575ba..5355a66 100644 --- a/kernel/include/slab_alloc.h +++ b/kernel/include/slab_alloc.h @@ -8,7 +8,14 @@ #include #include -#include +#if defined(__linux__) +//redefine necessary stuff +#include +#define ASSERT assert +#define PAGE_SIZE 0x1000 +#else +#include // this is macroscope +#endif // expected format for the array of slab_type_t given to slab_create : // an array of slab_type descriptors, with last descriptor full of zeroes -- cgit v1.2.3