Merge 3.8-rc5 into staging-next

This resolves a merge issue with a iio driver, and the zram code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 32 insertions, 0 deletions

diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
index 00fba2bab87d..130dfece27ac 100644
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -158,6 +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[] = {
         {
@@ -227,6 +230,35 @@ 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,
+                .maxlen         = sizeof(init_ipc_ns.ids[IPC_SEM_IDS].next_id),
+                .mode           = 0644,
+                .proc_handler   = proc_ipc_dointvec_minmax,
+                .extra1         = &zero,
+                .extra2         = &int_max,
+        },
+        {
+                .procname       = "msg_next_id",
+                .data           = &init_ipc_ns.ids[IPC_MSG_IDS].next_id,
+                .maxlen         = sizeof(init_ipc_ns.ids[IPC_MSG_IDS].next_id),
+                .mode           = 0644,
+                .proc_handler   = proc_ipc_dointvec_minmax,
+                .extra1         = &zero,
+                .extra2         = &int_max,
+        },
+        {
+                .procname       = "shm_next_id",
+                .data           = &init_ipc_ns.ids[IPC_SHM_IDS].next_id,
+                .maxlen         = sizeof(init_ipc_ns.ids[IPC_SHM_IDS].next_id),
+                .mode           = 0644,
+                .proc_handler   = proc_ipc_dointvec_minmax,
+                .extra1         = &zero,
+                .extra2         = &int_max,
+        },
+#endif
         {}
 };