Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / include / linux / ipc_namespace.h

diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index ae221a7b509237a649e8ccfed988265e22f07fa5..c4d870b0d5e6e26580bfd717d64489fce8d59aa6 100644 (file)
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -43,8 +43,8 @@ struct ipc_namespace {
 
        size_t          shm_ctlmax;
        size_t          shm_ctlall;
+       unsigned long   shm_tot;
        int             shm_ctlmni;
-       int             shm_tot;
        /*
         * Defines whether IPC_RMID is forced for _all_ shm segments regardless
         * of shmctl()