3 files changed, 6 insertions, 4 deletions

diff --git a/init/Kconfig b/init/Kconfig
index fed6dc31b0da..c4b3c6d51a72 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -616,13 +616,13 @@ config SYSFS_DEPRECATED
         bool
 
 config SYSFS_DEPRECATED_V2
-        bool "Create deprecated sysfs layout for older userspace tools"
+        bool "remove sysfs features which may confuse old userspace tools"
         depends on SYSFS
-        default y
+        default n
         select SYSFS_DEPRECATED
         help
           This option switches the layout of sysfs to the deprecated
-          version.
+          version. Do not use it on recent distributions.
 
           The current sysfs layout features a unified device tree at
           /sys/devices/, which is able to express a hierarchy between
diff --git a/init/do_mounts.c b/init/do_mounts.c
index dd7ee5f203f3..093f65915501 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -231,7 +231,8 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
 
 void __init mount_block_root(char *name, int flags)
 {
-        char *fs_names = __getname();
+        char *fs_names = __getname_gfp(GFP_KERNEL
+                | __GFP_NOTRACK_FALSE_POSITIVE);
         char *p;
 #ifdef CONFIG_BLOCK
         char b[BDEVNAME_SIZE];
diff --git a/init/main.c b/init/main.c
index 5e0d3f047eaf..7756ddad3c85 100644
--- a/init/main.c
+++ b/init/main.c
@@ -65,6 +65,7 @@
 #include <linux/idr.h>
 #include <linux/ftrace.h>
 #include <linux/async.h>
+#include <linux/kmemcheck.h>
 #include <linux/kmemtrace.h>
 #include <trace/boot.h>