git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: change the disk io api to accept device instead of port struct
[lunaix-os.git]
/
lunaix-os
/
kernel
/
mm
/
vmap.c
diff --git
a/lunaix-os/kernel/mm/vmap.c
b/lunaix-os/kernel/mm/vmap.c
index 0c1061009c2e66cb410991972165eaef46433967..deb18d30a05577333e824f3c7c8d7ded5e093b55 100644
(file)
--- a/
lunaix-os/kernel/mm/vmap.c
+++ b/
lunaix-os/kernel/mm/vmap.c
@@
-8,7
+8,7
@@
static uintptr_t start = VMAP_START;
void*
static uintptr_t start = VMAP_START;
void*
-vmm_vmap(uintptr_t paddr, size_t size, pt_attr attr
, pp_attr_t pattr
)
+vmm_vmap(uintptr_t paddr, size_t size, pt_attr attr)
{
// next fit
assert_msg((paddr & 0xfff) == 0, "vmap: bad alignment");
{
// next fit
assert_msg((paddr & 0xfff) == 0, "vmap: bad alignment");
@@
-27,7
+27,7
@@
vmm_vmap(uintptr_t paddr, size_t size, pt_attr attr, pp_attr_t pattr)
} else {
x86_page_table* ptd = (x86_page_table*)(L2_VADDR(l1inx));
size_t i = L2_INDEX(current_addr);
} else {
x86_page_table* ptd = (x86_page_table*)(L2_VADDR(l1inx));
size_t i = L2_INDEX(current_addr);
- for (; i <
1024
&& examed_size < size; i++) {
+ for (; i <
PG_MAX_ENTRIES
&& examed_size < size; i++) {
if (!ptd->entry[i]) {
examed_size += PG_SIZE;
} else if (examed_size) {
if (!ptd->entry[i]) {
examed_size += PG_SIZE;
} else if (examed_size) {