Make a few changes to the s390 c/r code to reflect v14 changes. CONFIG_CHECKPOINT_RESTART is now CONFIG_CHECKPOINT, and 'parent' is gone.
Signed-off-by: Serge E. Hallyn <[email protected]> --- arch/s390/mm/Makefile | 2 +- arch/s390/mm/checkpoint.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile index 040fbb7..b16161e 100644 --- a/arch/s390/mm/Makefile +++ b/arch/s390/mm/Makefile @@ -6,4 +6,4 @@ obj-y := init.o fault.o extmem.o mmap.o vmem.o pgtable.o obj-$(CONFIG_CMM) += cmm.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_PAGE_STATES) += page-states.o -obj-$(CONFIG_CHECKPOINT_RESTART) += checkpoint.o restart.o +obj-$(CONFIG_CHECKPOINT) += checkpoint.o restart.o diff --git a/arch/s390/mm/checkpoint.c b/arch/s390/mm/checkpoint.c index 216bdd8..c4e3719 100644 --- a/arch/s390/mm/checkpoint.c +++ b/arch/s390/mm/checkpoint.c @@ -79,7 +79,6 @@ int cr_write_cpu(struct cr_ctx *ctx, struct task_struct *t) h.type = CR_HDR_CPU; h.len = sizeof(*hh); - h.parent = task_pid_vnr(t); cr_s390_regs(CR_CPT, hh, t); @@ -98,7 +97,6 @@ int cr_write_head_arch(struct cr_ctx *ctx) h.type = CR_HDR_HEAD_ARCH; h.len = sizeof(*hh); - h.parent = 0; ret = cr_write_obj(ctx, &h, &hh); cr_hbuf_put(ctx, sizeof(*hh)); @@ -106,7 +104,7 @@ int cr_write_head_arch(struct cr_ctx *ctx) return ret; } -int cr_write_mm_context(struct cr_ctx *ctx, struct mm_struct *mm, int parent) +int cr_write_mm_context(struct cr_ctx *ctx, struct mm_struct *mm) { struct cr_hdr h; struct cr_hdr_mm_context *hh = cr_hbuf_get(ctx, sizeof(*hh)); @@ -114,7 +112,6 @@ int cr_write_mm_context(struct cr_ctx *ctx, struct mm_struct *mm, int parent) h.type = CR_HDR_MM_CONTEXT; h.len = sizeof(*hh); - h.parent = parent; cr_s390_mm(CR_CPT, hh, mm); -- 1.6.1 _______________________________________________ Containers mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/containers _______________________________________________ Devel mailing list [email protected] https://openvz.org/mailman/listinfo/devel
