[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20121026110557.17494.92212.stgit@localhost.localdomain>
Date: Fri, 26 Oct 2012 15:05:57 +0400
From: Stanislav Kinsbursky <skinsbursky@...allels.com>
To: akpm@...ux-foundation.org
Cc: Larry.Finger@...inger.net, mitsuo.hayasaka.hu@...achi.com,
nhorman@...driver.com, linux-doc@...r.kernel.org,
catalin.marinas@....com, xemul@...allels.com, will.deacon@....com,
linux-kernel@...r.kernel.org, cmetcalf@...era.com,
dhowells@...hat.com, ebiederm@...ssion.com, rob@...dley.net,
dan@...dstab.net, tglx@...utronix.de, paulmck@...ux.vnet.ibm.com,
devel@...nvz.org, mtk.manpages@...il.com
Subject: [PATCH 1/5] ipc: wrap new sysctls for CRIU inside
CONFIG_CHECKPOINT_RESTORE
This patch set wraps "msg_next_id", "sem_next_id" and "shm_next_id" inside
CONFIG_CHECKPOINT_RESTORE macro.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@...allels.com>
---
ipc/ipc_sysctl.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
index d06d77a..130dfec 100644
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -158,7 +158,9 @@ static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
static int zero;
static int one = 1;
+#ifdef CONFIG_CHECKPOINT_RESTORE
static int int_max = INT_MAX;
+#endif
static struct ctl_table ipc_kern_table[] = {
{
@@ -228,6 +230,7 @@ static struct ctl_table ipc_kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
+#ifdef CONFIG_CHECKPOINT_RESTORE
{
.procname = "sem_next_id",
.data = &init_ipc_ns.ids[IPC_SEM_IDS].next_id,
@@ -255,6 +258,7 @@ static struct ctl_table ipc_kern_table[] = {
.extra1 = &zero,
.extra2 = &int_max,
},
+#endif
{}
};
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists