On Thu, Jan 26, 2012 at 10:00:47AM +0100, Marek Szyprowski wrote: > From: Michal Nazarewicz <mina86@xxxxxxxxxx> > > This commit exports some of the functions from compaction.c file > outside of it adding their declaration into internal.h header > file so that other mm related code can use them. > > This forced compaction.c to always be compiled (as opposed to being > compiled only if CONFIG_COMPACTION is defined) but as to avoid > introducing code that user did not ask for, part of the compaction.c > is now wrapped in on #ifdef. > > Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx> > Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> > --- > mm/Makefile | 3 +- > mm/compaction.c | 314 ++++++++++++++++++++++++++----------------------------- > mm/internal.h | 33 ++++++ > 3 files changed, 184 insertions(+), 166 deletions(-) > > diff --git a/mm/Makefile b/mm/Makefile > index 50ec00e..8aada89 100644 > --- a/mm/Makefile > +++ b/mm/Makefile > @@ -13,7 +13,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.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) > + compaction.o $(mmu-y) > obj-y += init-mm.o > > ifdef CONFIG_NO_BOOTMEM > @@ -32,7 +32,6 @@ obj-$(CONFIG_NUMA) += mempolicy.o > obj-$(CONFIG_SPARSEMEM) += sparse.o > obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o > obj-$(CONFIG_SLOB) += slob.o > -obj-$(CONFIG_COMPACTION) += compaction.o > obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o > obj-$(CONFIG_KSM) += ksm.o > obj-$(CONFIG_PAGE_POISONING) += debug-pagealloc.o > diff --git a/mm/compaction.c b/mm/compaction.c > index 63f82be..3e21d28 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -16,30 +16,11 @@ > #include <linux/sysfs.h> > #include "internal.h" > > +#if defined CONFIG_COMPACTION || defined CONFIG_CMA > + This is pedantic but you reference CONFIG_CMA before the patch that declares it. The only time this really matters is when it breaks bisection but I do not think that is the case here. Whether you fix this or not by moving the CONFIG_CMA check to the same patch that declares it in Kconfig Acked-by: Mel Gorman <mel@xxxxxxxxx> -- Mel Gorman SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
