diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts.c | 1 | ||||
-rw-r--r-- | init/do_mounts_rd.c | 1 | ||||
-rw-r--r-- | init/main.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index bb008d064c1a..02e3ca4fc527 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/initrd.h> | 15 | #include <linux/initrd.h> |
16 | #include <linux/async.h> | 16 | #include <linux/async.h> |
17 | #include <linux/fs_struct.h> | 17 | #include <linux/fs_struct.h> |
18 | #include <linux/slab.h> | ||
18 | 19 | ||
19 | #include <linux/nfs_fs.h> | 20 | #include <linux/nfs_fs.h> |
20 | #include <linux/nfs_fs_sb.h> | 21 | #include <linux/nfs_fs_sb.h> |
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index 027a402708de..bf3ef667bf36 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/cramfs_fs.h> | 7 | #include <linux/cramfs_fs.h> |
8 | #include <linux/initrd.h> | 8 | #include <linux/initrd.h> |
9 | #include <linux/string.h> | 9 | #include <linux/string.h> |
10 | #include <linux/slab.h> | ||
10 | 11 | ||
11 | #include "do_mounts.h" | 12 | #include "do_mounts.h" |
12 | #include "../fs/squashfs/squashfs_fs.h" | 13 | #include "../fs/squashfs/squashfs_fs.h" |
diff --git a/init/main.c b/init/main.c index a1ab78ceb4b6..5c8540271529 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/bootmem.h> | 25 | #include <linux/bootmem.h> |
26 | #include <linux/acpi.h> | 26 | #include <linux/acpi.h> |
27 | #include <linux/tty.h> | 27 | #include <linux/tty.h> |
28 | #include <linux/gfp.h> | ||
29 | #include <linux/percpu.h> | 28 | #include <linux/percpu.h> |
30 | #include <linux/kmod.h> | 29 | #include <linux/kmod.h> |
31 | #include <linux/vmalloc.h> | 30 | #include <linux/vmalloc.h> |
@@ -69,6 +68,7 @@ | |||
69 | #include <linux/kmemtrace.h> | 68 | #include <linux/kmemtrace.h> |
70 | #include <linux/sfi.h> | 69 | #include <linux/sfi.h> |
71 | #include <linux/shmem_fs.h> | 70 | #include <linux/shmem_fs.h> |
71 | #include <linux/slab.h> | ||
72 | #include <trace/boot.h> | 72 | #include <trace/boot.h> |
73 | 73 | ||
74 | #include <asm/io.h> | 74 | #include <asm/io.h> |
@@ -858,7 +858,7 @@ static int __init kernel_init(void * unused) | |||
858 | /* | 858 | /* |
859 | * init can allocate pages on any node | 859 | * init can allocate pages on any node |
860 | */ | 860 | */ |
861 | set_mems_allowed(node_possible_map); | 861 | set_mems_allowed(node_states[N_HIGH_MEMORY]); |
862 | /* | 862 | /* |
863 | * init can run on any cpu. | 863 | * init can run on any cpu. |
864 | */ | 864 | */ |