2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c
index a84b53c01436..459b9ac45cf5 100644
--- a/drivers/xen/xenfs/super.c
+++ b/drivers/xen/xenfs/super.c
@@ -30,7 +30,8 @@ static struct inode *xenfs_make_inode(struct super_block *sb, int mode)
 
         if (ret) {
                 ret->i_mode = mode;
-                ret->i_uid = ret->i_gid = 0;
+                ret->i_uid = GLOBAL_ROOT_UID;
+                ret->i_gid = GLOBAL_ROOT_GID;
                 ret->i_blocks = 0;
                 ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
         }
diff --git a/init/Kconfig b/init/Kconfig
index 7ee6e19632dd..485c60ae2aed 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -932,8 +932,6 @@ config UIDGID_CONVERTED
         depends on NET_9P = n
 
         # Filesystems
-        depends on XENFS = n
-
         depends on 9P_FS = n
         depends on ADFS_FS = n
         depends on AFFS_FS = n