The checkpoint-related declarations in mm.h don't require the definitions of struct ckpt_ctx and ckpt_hdr_vma; simply forward declare these and remove the include of checkpoint_types.h. Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx> --- include/linux/mm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index c8e8972..fa89212 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -14,13 +14,12 @@ #include <linux/debug_locks.h> #include <linux/mm_types.h> -#include <linux/checkpoint_types.h> - struct mempolicy; struct anon_vma; struct file_ra_state; struct user_struct; struct writeback_control; +struct ckpt_ctx; #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ extern unsigned long max_mapnr; @@ -1199,6 +1198,7 @@ void task_dirty_inc(struct task_struct *tsk); /* checkpoint/restart */ #ifdef CONFIG_CHECKPOINT +struct ckpt_hdr_vma; extern int filemap_restore(struct ckpt_ctx *ctx, struct mm_struct *mm, struct ckpt_hdr_vma *hh); extern int special_mapping_restore(struct ckpt_ctx *ctx, struct mm_struct *mm, -- 1.6.0.6 _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers