| Message ID | 20190722094143.18387-1-hch@lst.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 14c5cebad510c2875ca525f36605b47058769670 |
| Headers | show |
| Series | memremap: move from kernel/ to mm/ | expand |
On 07/22/2019 03:11 PM, Christoph Hellwig wrote: > memremap.c implements MM functionality for ZONE_DEVICE, so it really > should be in the mm/ directory, not the kernel/ one. > > Signed-off-by: Christoph Hellwig <hch@lst.de> This always made sense. FWIW Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
On Mon, Jul 22, 2019 at 2:42 AM Christoph Hellwig <hch@lst.de> wrote: > > memremap.c implements MM functionality for ZONE_DEVICE, so it really > should be in the mm/ directory, not the kernel/ one. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Dan Williams <dan.j.williams@intel.com>
Andrew, I've seen you've queued this up in -mm, but the explicit intent here was to quickly merge this after -rc1 so that the move doesn't conflict with further development for 5.3. Any chance you could send this patch on to Linus?
On Fri, 2 Aug 2019 10:32:30 +0200 Christoph Hellwig <hch@lst.de> wrote: > Andrew, > > I've seen you've queued this up in -mm, but the explicit intent here was > to quickly merge this after -rc1 so that the move doesn't conflict with > further development for 5.3. Didn't know that. > Any chance you could send this patch on to Linus? Sure, I'll add it to today's batch.
diff --git a/kernel/Makefile b/kernel/Makefile index a8d923b5481b..ef0d95a190b4 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -111,7 +111,6 @@ obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o obj-$(CONFIG_TORTURE_TEST) += torture.o obj-$(CONFIG_HAS_IOMEM) += iomem.o -obj-$(CONFIG_ZONE_DEVICE) += memremap.o obj-$(CONFIG_RSEQ) += rseq.o obj-$(CONFIG_GCC_PLUGIN_STACKLEAK) += stackleak.o diff --git a/mm/Makefile b/mm/Makefile index 338e528ad436..d0b295c3b764 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -102,5 +102,6 @@ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o obj-$(CONFIG_DEBUG_PAGE_REF) += debug_page_ref.o obj-$(CONFIG_HARDENED_USERCOPY) += usercopy.o obj-$(CONFIG_PERCPU_STATS) += percpu-stats.o +obj-$(CONFIG_ZONE_DEVICE) += memremap.o obj-$(CONFIG_HMM_MIRROR) += hmm.o obj-$(CONFIG_MEMFD_CREATE) += memfd.o diff --git a/kernel/memremap.c b/mm/memremap.c similarity index 100% rename from kernel/memremap.c rename to mm/memremap.c
memremap.c implements MM functionality for ZONE_DEVICE, so it really should be in the mm/ directory, not the kernel/ one. Signed-off-by: Christoph Hellwig <hch@lst.de> --- Sending for applying just after -rc1 preferably to avoid conflicts later in the merge window kernel/Makefile | 1 - mm/Makefile | 1 + {kernel => mm}/memremap.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {kernel => mm}/memremap.c (100%)