---

yaml --- r: 234887 b: refs/heads/master c: 0932587 h: refs/heads/master i: 234885: a5f7fee 234883: b231509 234879: e39006e v: v3
git-mirror · Feb 24, 2011 · 4a31660 · 4a31660
1 parent 7197ea7
commit 4a31660
Show file tree

Hide file tree

Showing 4 changed files with 416 additions and 172 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bf50555b0920be7e29d3823f6bbd20ee5920489
+refs/heads/master: 0932587328d9bd5b500a640fbaff3290c8d4cabf
diff --git a/trunk/mm/Makefile b/trunk/mm/Makefile
@@ -7,14 +7,20 @@ mmu-$(CONFIG_MMU)	:= fremap.o highmem.o madvise.o memory.o mincore.o \
 			   mlock.o mmap.o mprotect.o mremap.o msync.o rmap.o \
 			   vmalloc.o pagewalk.o pgtable-generic.o
 
-obj-y			:= bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
+obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
 			   maccess.o page_alloc.o page-writeback.o \
 			   readahead.o swap.o truncate.o vmscan.o shmem.o \
 			   prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \
 			   page_isolation.o mm_init.o mmu_context.o percpu.o \
 			   $(mmu-y)
 obj-y += init-mm.o
 
+ifdef CONFIG_NO_BOOTMEM
+	obj-y		+= nobootmem.o
+else
+	obj-y		+= bootmem.o
+endif
+
 obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
 
 obj-$(CONFIG_BOUNCE)	+= bounce.o