Thanks. Merged to master at 915eac00a7e0..08f92be0467a (from, to]
You can see the entire diff with 'git diff' or at https://github.com/brho/akaros/compare/915eac00a7e0...08f92be0467a On 2016-01-29 at 16:25 'Kanoj Sarcar' via Akaros wrote: > Signed-off-by: Kanoj Sarcar <[email protected]> > --- > You can also find these patches at: > [email protected]:brho/akaros.git > FROM: 915eac0 915eac0 > TO: b437713 b437713 > > And view them at: > https://github.com/brho/akaros/compare/915eac0...b437713 > > kern/src/mm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kern/src/mm.c b/kern/src/mm.c > index 2ad0f7d..7b7e542 100644 > --- a/kern/src/mm.c > +++ b/kern/src/mm.c > @@ -636,6 +636,7 @@ void *do_mmap(struct proc *p, uintptr_t addr, > size_t len, int prot, int flags, addr = vmr->vm_base; > vmr->vm_prot = prot; > vmr->vm_flags = flags; > + vmr->vm_foff = offset; > if (file) { > if (!check_file_perms(vmr, file, prot)) { > assert(!vmr->vm_file); > @@ -669,7 +670,6 @@ void *do_mmap(struct proc *p, uintptr_t addr, > size_t len, int prot, int flags, pm_add_vmr(file2pm(file), vmr); > } > vmr->vm_file = file; > - vmr->vm_foff = offset; > vmr = merge_me(vmr); /* attempts to merge > with neighbors */ > if (flags & MAP_POPULATE && prot != PROT_NONE) { -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
