Applied. I added the commit comment to the code, because when (and if) we fold this to v20, the commit message will be gone. Oren. Serge E. Hallyn wrote: > Because the s390 version won't set up vdso if it is 0. It > is safe to assume that if we are calling special_mapping_restore() > then there is a vdso in the checkpoint image, and if that is > the case then the checkpointed program was dynamically linked. > > Other architectures ignore uses_interp so this shouldn't > matter to them. > > Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx> > --- > mm/mmap.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index 6aa606a..9cded98 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -2404,7 +2404,7 @@ int special_mapping_restore(struct ckpt_ctx *ctx, > if (test_thread_flag(TIF_IA32)) > return syscall32_setup_pages(NULL, h->vm_start, 0); > #endif > - return arch_setup_additional_pages(NULL, h->vm_start, 0); > + return arch_setup_additional_pages(NULL, h->vm_start, 1); > } > #else /* !CONFIG_CHECKPOINT */ > #define special_mapping_checkpoint NULL _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers
