mmc: dw_mmc: fix unmap sg twice when finding data err

[firefly-linux-kernel-4.4.55.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 6bbef5604101cf52f6d052f7de96e373920847b5..b069ccbfb0b0375b5ab03445472f2679d6981bbf 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -50,10 +50,15 @@ struct user_namespace init_user_ns = {
        .count = ATOMIC_INIT(3),
        .owner = GLOBAL_ROOT_UID,
        .group = GLOBAL_ROOT_GID,
-       .proc_inum = PROC_USER_INIT_INO,
+       .ns.inum = PROC_USER_INIT_INO,
+#ifdef CONFIG_USER_NS
+       .ns.ops = &userns_operations,
+#endif
        .flags = USERNS_INIT_FLAGS,
-       .may_mount_sysfs = true,
-       .may_mount_proc = true,
+#ifdef CONFIG_PERSISTENT_KEYRINGS
+       .persistent_keyring_register_sem =
+       __RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),
+#endif
 };
 EXPORT_SYMBOL_GPL(init_user_ns);
 
@@ -86,7 +91,6 @@ static DEFINE_SPINLOCK(uidhash_lock);
 struct user_struct root_user = {
        .__count        = ATOMIC_INIT(1),
        .processes      = ATOMIC_INIT(1),
-       .files          = ATOMIC_INIT(0),
        .sigpending     = ATOMIC_INIT(0),
        .locked_shm     = 0,
        .uid            = GLOBAL_ROOT_UID,
@@ -221,5 +225,4 @@ static int __init uid_cache_init(void)
 
        return 0;
 }
-
-module_init(uid_cache_init);
+subsys_initcall(uid_cache_init);