diff options
| author | Alexis211 <alexis211@gmail.com> | 2010-04-07 11:37:21 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2010-04-07 11:37:21 +0200 |
| commit | ee348973b0cb0f6481e4fd6e7494c63167c9759c (patch) | |
| tree | a9f1cd82703aaeeefbf4cf449203881cfcafc0a5 /src/kernel/mem | |
| parent | ca4f5906f284e60a7a59ca7450e3e09c4f9356e5 (diff) | |
| download | TCE-ee348973b0cb0f6481e4fd6e7494c63167c9759c.tar.gz TCE-ee348973b0cb0f6481e4fd6e7494c63167c9759c.zip | |
More work on manager
Diffstat (limited to 'src/kernel/mem')
| -rw-r--r-- | src/kernel/mem/paging.c | 2 | ||||
| -rw-r--r-- | src/kernel/mem/seg.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/kernel/mem/paging.c b/src/kernel/mem/paging.c index 9972b2a..4992d5e 100644 --- a/src/kernel/mem/paging.c +++ b/src/kernel/mem/paging.c @@ -121,7 +121,7 @@ uint32_t paging_fault(struct registers *regs) { if (regs->err_code & 0x4) monitor_write("user "); if (regs->err_code & 0x8) monitor_write("rsvd "); if (regs->err_code & 0x10) monitor_write("instructionfetch "); - monitor_write("@"); monitor_writeHex(addr); monitor_write("\n"); + monitor_write("cr2:"); monitor_writeHex(addr); monitor_write("\n"); return 1; } return 0; diff --git a/src/kernel/mem/seg.c b/src/kernel/mem/seg.c index ffaa84c..e3eca67 100644 --- a/src/kernel/mem/seg.c +++ b/src/kernel/mem/seg.c @@ -1,5 +1,6 @@ #include "seg.h" #include "mem.h" +#include <core/sys.h> struct segment_map *seg_map(struct segment* seg, struct page_directory *pagedir, size_t offset) { struct segment_map *sm = seg->map(seg, pagedir, offset); |