Skip to contentSkip to conversation

fix sysvipc=n compile

PATCH In review Serge E. Hallyn 2 participants 2 messages Mar 15, 2010 1 message not in the archive

lore
Share & tools
lore

Serge E. Hallyn

author
#0 lore raw

PATCH 1/1 fix sysvipc=n compile

checkpoint_bad and restore_bad no longer exist, use NULL.

Signed-off-by Serge E. Hallyn <serue-r/[email protected]>
---
 include/linux/checkpoint.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/checkpoint.h +2 -2
index 8053ca4..792b523 100644
@@ -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)
 {
Signature · 1 line
1.6.1

A message that is not in the archive (sent off-list or not yet received): 20100315194151.GA24909-r/[email protected]

#2 lore raw

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.

Quoted 22 lines · Serge E. Hallyn

checkpoint_bad and restore_bad no longer exist, use NULL.

Signed-off-by Serge E. Hallyn <serue-r/[email protected]>
---
 include/linux/checkpoint.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/checkpoint.h +2 -2
index 8053ca4..792b523 100644
@@ -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)
 {