Pushed this and the recent patches (without net-ns) to ckpt-v20-rc2.
Unless we hit new troubles with this one, I'll fold it and send out.
Oren.
Serge E. Hallyn wrote:
> checkpoint_bad and restore_bad no longer exist, use NULL.
>
> Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
> ---
> include/linux/checkpoint.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/checkpoint.h b/include/linux/checkpoint.h
> index 8053ca4..792b523 100644
> --- a/include/linux/checkpoint.h
> +++ b/include/linux/checkpoint.h
> @@ -215,8 +215,8 @@ extern void *restore_ipc_ns(struct ckpt_ctx *ctx);
> extern int ckpt_collect_ipc_ns(struct ckpt_ctx *ctx,
> struct ipc_namespace *ipc_ns);
> #else
> -#define checkpoint_ipc_ns checkpoint_bad
> -#define restore_ipc_ns restore_bad
> +#define checkpoint_ipc_ns NULL
> +#define restore_ipc_ns NULL
> static inline int ckpt_collect_ipc_ns(struct ckpt_ctx *ctx,
> struct ipc_namespace *ipc_ns)
> {
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers
