projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] pm8001: drop redundant memset
[linux-2.6-microblaze.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
a1ab78c
..
5c85402
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-25,7
+25,6
@@
#include <linux/bootmem.h>
#include <linux/acpi.h>
#include <linux/tty.h>
#include <linux/bootmem.h>
#include <linux/acpi.h>
#include <linux/tty.h>
-#include <linux/gfp.h>
#include <linux/percpu.h>
#include <linux/kmod.h>
#include <linux/vmalloc.h>
#include <linux/percpu.h>
#include <linux/kmod.h>
#include <linux/vmalloc.h>
@@
-69,6
+68,7
@@
#include <linux/kmemtrace.h>
#include <linux/sfi.h>
#include <linux/shmem_fs.h>
#include <linux/kmemtrace.h>
#include <linux/sfi.h>
#include <linux/shmem_fs.h>
+#include <linux/slab.h>
#include <trace/boot.h>
#include <asm/io.h>
#include <trace/boot.h>
#include <asm/io.h>
@@
-858,7
+858,7
@@
static int __init kernel_init(void * unused)
/*
* init can allocate pages on any node
*/
/*
* init can allocate pages on any node
*/
- set_mems_allowed(node_
possible_map
);
+ set_mems_allowed(node_
states[N_HIGH_MEMORY]
);
/*
* init can run on any cpu.
*/
/*
* init can run on any cpu.
*/