diff options
-rw-r--r-- | mm/Makefile | 3 | ||||
-rw-r--r-- | mm/mm_init.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mm/Makefile b/mm/Makefile index 4bbc8f094ff0..06ca2381fef1 100644 --- a/mm/Makefile +++ b/mm/Makefile | |||
@@ -11,7 +11,7 @@ obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ | |||
11 | maccess.o page_alloc.o page-writeback.o pdflush.o \ | 11 | maccess.o page_alloc.o page-writeback.o pdflush.o \ |
12 | readahead.o swap.o truncate.o vmscan.o \ | 12 | readahead.o swap.o truncate.o vmscan.o \ |
13 | prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \ | 13 | prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \ |
14 | page_isolation.o $(mmu-y) | 14 | page_isolation.o mm_init.o $(mmu-y) |
15 | 15 | ||
16 | obj-$(CONFIG_PROC_PAGE_MONITOR) += pagewalk.o | 16 | obj-$(CONFIG_PROC_PAGE_MONITOR) += pagewalk.o |
17 | obj-$(CONFIG_BOUNCE) += bounce.o | 17 | obj-$(CONFIG_BOUNCE) += bounce.o |
@@ -26,7 +26,6 @@ obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o | |||
26 | obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o | 26 | obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o |
27 | obj-$(CONFIG_SLOB) += slob.o | 27 | obj-$(CONFIG_SLOB) += slob.o |
28 | obj-$(CONFIG_SLAB) += slab.o | 28 | obj-$(CONFIG_SLAB) += slab.o |
29 | obj-$(CONFIG_DEBUG_MEMORY_INIT) += mm_init.o | ||
30 | obj-$(CONFIG_SLUB) += slub.o | 29 | obj-$(CONFIG_SLUB) += slub.o |
31 | obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o | 30 | obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o |
32 | obj-$(CONFIG_FS_XIP) += filemap_xip.o | 31 | obj-$(CONFIG_FS_XIP) += filemap_xip.o |
diff --git a/mm/mm_init.c b/mm/mm_init.c index ce445ca097e7..eaf0d3b47099 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include "internal.h" | 10 | #include "internal.h" |
11 | 11 | ||
12 | #ifdef CONFIG_DEBUG_MEMORY_INIT | ||
12 | int __meminitdata mminit_loglevel; | 13 | int __meminitdata mminit_loglevel; |
13 | 14 | ||
14 | /* The zonelists are simply reported, validation is manual. */ | 15 | /* The zonelists are simply reported, validation is manual. */ |
@@ -132,3 +133,4 @@ static __init int set_mminit_loglevel(char *str) | |||
132 | return 0; | 133 | return 0; |
133 | } | 134 | } |
134 | early_param("mminit_loglevel", set_mminit_loglevel); | 135 | early_param("mminit_loglevel", set_mminit_loglevel); |
136 | #endif /* CONFIG_DEBUG_MEMORY_INIT */ | ||