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
rework parsing of interupt-map in interrupt node.
[lunaix-os.git]
/
lunaix-os
/
kernel
/
mm
/
dmm.c
diff --git
a/lunaix-os/kernel/mm/dmm.c
b/lunaix-os/kernel/mm/dmm.c
index a76b9de979dd8e93ad68c6e9a24fdc7e7a571664..50804dbf47ee46523e89e3003d2f1e6a532248fe 100644
(file)
--- a/
lunaix-os/kernel/mm/dmm.c
+++ b/
lunaix-os/kernel/mm/dmm.c
@@
-21,7
+21,7
@@
create_heap(struct proc_mm* pvms, ptr_t addr)
.flags = MAP_ANON | MAP_PRIVATE,
.type = REGION_TYPE_HEAP,
.proct = PROT_READ | PROT_WRITE,
.flags = MAP_ANON | MAP_PRIVATE,
.type = REGION_TYPE_HEAP,
.proct = PROT_READ | PROT_WRITE,
- .mlen = P
G
_SIZE };
+ .mlen = P
AGE
_SIZE };
int status = 0;
struct mm_region* heap;
if ((status = mmap_user(NULL, &heap, addr, NULL, &map_param))) {
int status = 0;
struct mm_region* heap;
if ((status = mmap_user(NULL, &heap, addr, NULL, &map_param))) {
@@
-42,7
+42,7
@@
__DEFINE_LXSYSCALL1(void*, sbrk, ssize_t, incr)
assert(heap);
int err = mem_adjust_inplace(&pvms->regions, heap, heap->end + incr);
if (err) {
assert(heap);
int err = mem_adjust_inplace(&pvms->regions, heap, heap->end + incr);
if (err) {
- return (void*)
DO_STATUS(err
);
+ return (void*)
__ptr(DO_STATUS(err)
);
}
return (void*)heap->end;
}
}
return (void*)heap->end;
}