2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index cff8a6c32161..65a2a23f6f8a 100644
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -61,8 +61,8 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry,
 
         inode->i_ino = get_next_ino();
         inode->i_mode = mode;
-        inode->i_uid = 0;
-        inode->i_gid = 0;
+        inode->i_uid = GLOBAL_ROOT_UID;
+        inode->i_gid = GLOBAL_ROOT_GID;
         inode->i_blocks = 0;
         inode->i_atime = CURRENT_TIME;
         inode->i_mtime = inode->i_atime;
diff --git a/init/Kconfig b/init/Kconfig
index 355b1af6932e..f0371a65ac06 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -960,7 +960,6 @@ config UIDGID_CONVERTED
         depends on !UML || HOSTFS = n
 
         # The rare drivers that won't build
-        depends on INFINIBAND_QIB = n
         depends on BLK_DEV_LOOP = n
         depends on ANDROID_BINDER_IPC = n