Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2646 → Rev 2647

/trunk/kernel/generic/src/mm/as.c
640,7 → 640,7
* sharing.
*/
int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
as_t *dst_as, uintptr_t dst_base, int dst_flags_mask)
as_t *dst_as, uintptr_t dst_base, int dst_flags_mask)
{
ipl_t ipl;
int src_flags;
702,6 → 702,10
sh_info->refcount = 2;
btree_create(&sh_info->pagemap);
src_area->sh_info = sh_info;
/*
* Call the backend to setup sharing.
*/
src_area->backend->share(src_area);
} else {
mutex_lock(&sh_info->lock);
sh_info->refcount++;
708,8 → 712,6
mutex_unlock(&sh_info->lock);
}
 
src_area->backend->share(src_area);
 
mutex_unlock(&src_area->lock);
mutex_unlock(&src_as->lock);
 
/trunk/kernel/generic/src/mm/backend_elf.c
304,7 → 304,7
* by the ELF image.
*/
if (!(area->flags & AS_AREA_WRITE))
if (base + count*PAGE_SIZE <= start_anon)
if (base + count * PAGE_SIZE <= start_anon)
continue;
for (j = 0; j < count; j++) {