3 files changed, 4 insertions, 4 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c5e68adc6732..ee9d69707c0a 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -77,7 +77,7 @@ struct mqueue_inode_info {
 
 static const struct inode_operations mqueue_dir_inode_operations;
 static const struct file_operations mqueue_file_operations;
-static struct super_operations mqueue_super_ops;
+static const struct super_operations mqueue_super_ops;
 static void remove_notification(struct mqueue_inode_info *info);
 
 static struct kmem_cache *mqueue_inode_cachep;
@@ -1224,7 +1224,7 @@ static const struct file_operations mqueue_file_operations = {
         .read = mqueue_read_file,
 };
 
-static struct super_operations mqueue_super_ops = {
+static const struct super_operations mqueue_super_ops = {
         .alloc_inode = mqueue_alloc_inode,
         .destroy_inode = mqueue_destroy_inode,
         .statfs = simple_statfs,
diff --git a/ipc/shm.c b/ipc/shm.c
index 30162a59621a..9eb1488b543b 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -370,7 +370,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
                 if (shmflg & SHM_NORESERVE)
                         acctflag = VM_NORESERVE;
                 file = hugetlb_file_setup(name, size, acctflag,
-                                                        &shp->mlock_user);
+                                        &shp->mlock_user, HUGETLB_SHMFS_INODE);
         } else {
                 /*
                  * Do not allow no accounting for OVERCOMMIT_NEVER, even
diff --git a/ipc/util.c b/ipc/util.c
index b8e4ba92f6d1..79ce84e890f7 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -942,7 +942,7 @@ static int sysvipc_proc_show(struct seq_file *s, void *it)
         return iface->show(s, it);
 }
 
-static struct seq_operations sysvipc_proc_seqops = {
+static const struct seq_operations sysvipc_proc_seqops = {
         .start = sysvipc_proc_start,
         .stop  = sysvipc_proc_stop,
         .next  = sysvipc_proc_next,