From: Tim Chen <tim.c.chen@linux.intel.com> To: Randy Dunlap <rdunlap@infradead.org>, Linux MM <linux-mm@kvack.org>, Andrew Morton <akpm@linux-foundation.org> Cc: LKML <linux-kernel@vger.kernel.org> Subject: Re: [PATCH] mm/swap_slots: use conditional compilation for swap_slots.c Date: Tue, 30 Jan 2018 15:54:45 -0800 [thread overview] Message-ID: <1aa4baf5-7d56-84f9-e66d-476acaaec330@linux.intel.com> (raw) In-Reply-To: <c2a47015-0b5a-d0d9-8bc7-9984c049df20@infradead.org> On 01/30/2018 03:14 PM, Randy Dunlap wrote: > From: Randy Dunlap <rdunlap@infradead.org> > > For mm/swap_slots.c, use the traditional Linux method of conditional > compilation and linking instead of always compiling it by using > #ifdef CONFIG_SWAP and #endif for the entire source file (excluding > header files). > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Tim Chen <tim.c.chen@linux.intel.com> > --- > mm/Makefile | 4 ++-- > mm/swap_slots.c | 4 ---- > 2 files changed, 2 insertions(+), 6 deletions(-) > > Tim, is there some reason that this is done as it currently is? Rearranging code the way you have proposed makes sense. You can add my ack. Thanks. Tim > > --- lnx-415.orig/mm/Makefile > +++ lnx-415/mm/Makefile > @@ -37,7 +37,7 @@ obj-y := filemap.o mempool.o oom_kill. > readahead.o swap.o truncate.o vmscan.o shmem.o \ > util.o mmzone.o vmstat.o backing-dev.o \ > mm_init.o mmu_context.o percpu.o slab_common.o \ > - compaction.o vmacache.o swap_slots.o \ > + compaction.o vmacache.o \ > interval_tree.o list_lru.o workingset.o \ > debug.o $(mmu-y) > > @@ -55,7 +55,7 @@ ifdef CONFIG_MMU > endif > obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o > > -obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o > +obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o > obj-$(CONFIG_FRONTSWAP) += frontswap.o > obj-$(CONFIG_ZSWAP) += zswap.o > obj-$(CONFIG_HAS_DMA) += dmapool.o > --- lnx-415.orig/mm/swap_slots.c > +++ lnx-415/mm/swap_slots.c > @@ -34,8 +34,6 @@ > #include <linux/mutex.h> > #include <linux/mm.h> > > -#ifdef CONFIG_SWAP > - > static DEFINE_PER_CPU(struct swap_slots_cache, swp_slots); > static bool swap_slot_cache_active; > bool swap_slot_cache_enabled; > @@ -356,5 +354,3 @@ repeat: > > return entry; > } > - > -#endif /* CONFIG_SWAP */ > >
WARNING: multiple messages have this Message-ID (diff)
From: Tim Chen <tim.c.chen@linux.intel.com> To: Randy Dunlap <rdunlap@infradead.org>, Linux MM <linux-mm@kvack.org>, Andrew Morton <akpm@linux-foundation.org> Cc: LKML <linux-kernel@vger.kernel.org> Subject: Re: [PATCH] mm/swap_slots: use conditional compilation for swap_slots.c Date: Tue, 30 Jan 2018 15:54:45 -0800 [thread overview] Message-ID: <1aa4baf5-7d56-84f9-e66d-476acaaec330@linux.intel.com> (raw) In-Reply-To: <c2a47015-0b5a-d0d9-8bc7-9984c049df20@infradead.org> On 01/30/2018 03:14 PM, Randy Dunlap wrote: > From: Randy Dunlap <rdunlap@infradead.org> > > For mm/swap_slots.c, use the traditional Linux method of conditional > compilation and linking instead of always compiling it by using > #ifdef CONFIG_SWAP and #endif for the entire source file (excluding > header files). > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Tim Chen <tim.c.chen@linux.intel.com> > --- > mm/Makefile | 4 ++-- > mm/swap_slots.c | 4 ---- > 2 files changed, 2 insertions(+), 6 deletions(-) > > Tim, is there some reason that this is done as it currently is? Rearranging code the way you have proposed makes sense. You can add my ack. Thanks. Tim > > --- lnx-415.orig/mm/Makefile > +++ lnx-415/mm/Makefile > @@ -37,7 +37,7 @@ obj-y := filemap.o mempool.o oom_kill. > readahead.o swap.o truncate.o vmscan.o shmem.o \ > util.o mmzone.o vmstat.o backing-dev.o \ > mm_init.o mmu_context.o percpu.o slab_common.o \ > - compaction.o vmacache.o swap_slots.o \ > + compaction.o vmacache.o \ > interval_tree.o list_lru.o workingset.o \ > debug.o $(mmu-y) > > @@ -55,7 +55,7 @@ ifdef CONFIG_MMU > endif > obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o > > -obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o > +obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o > obj-$(CONFIG_FRONTSWAP) += frontswap.o > obj-$(CONFIG_ZSWAP) += zswap.o > obj-$(CONFIG_HAS_DMA) += dmapool.o > --- lnx-415.orig/mm/swap_slots.c > +++ lnx-415/mm/swap_slots.c > @@ -34,8 +34,6 @@ > #include <linux/mutex.h> > #include <linux/mm.h> > > -#ifdef CONFIG_SWAP > - > static DEFINE_PER_CPU(struct swap_slots_cache, swp_slots); > static bool swap_slot_cache_active; > bool swap_slot_cache_enabled; > @@ -356,5 +354,3 @@ repeat: > > return entry; > } > - > -#endif /* CONFIG_SWAP */ > > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2018-01-30 23:54 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-30 23:14 [PATCH] mm/swap_slots: use conditional compilation for swap_slots.c Randy Dunlap 2018-01-30 23:14 ` Randy Dunlap 2018-01-30 23:54 ` Tim Chen [this message] 2018-01-30 23:54 ` Tim Chen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1aa4baf5-7d56-84f9-e66d-476acaaec330@linux.intel.com \ --to=tim.c.chen@linux.intel.com \ --cc=akpm@linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=rdunlap@infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.