diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts.c | 3 | ||||
-rw-r--r-- | init/main.c | 1 |
2 files changed, 3 insertions, 1 deletions
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) | |||
231 | 231 | ||
232 | void __init mount_block_root(char *name, int flags) | 232 | void __init mount_block_root(char *name, int flags) |
233 | { | 233 | { |
234 | char *fs_names = __getname(); | 234 | char *fs_names = __getname_gfp(GFP_KERNEL |
235 | | __GFP_NOTRACK_FALSE_POSITIVE); | ||
235 | char *p; | 236 | char *p; |
236 | #ifdef CONFIG_BLOCK | 237 | #ifdef CONFIG_BLOCK |
237 | char b[BDEVNAME_SIZE]; | 238 | char b[BDEVNAME_SIZE]; |
diff --git a/init/main.c b/init/main.c index f6204f712e7c..7becd8b5c5bf 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -65,6 +65,7 @@ | |||
65 | #include <linux/idr.h> | 65 | #include <linux/idr.h> |
66 | #include <linux/ftrace.h> | 66 | #include <linux/ftrace.h> |
67 | #include <linux/async.h> | 67 | #include <linux/async.h> |
68 | #include <linux/kmemcheck.h> | ||
68 | #include <linux/kmemtrace.h> | 69 | #include <linux/kmemtrace.h> |
69 | #include <trace/boot.h> | 70 | #include <trace/boot.h> |
70 | 71 | ||