| Message ID | 20220207063249.1833066-2-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/8] mm: remove a pointless CONFIG_ZONE_DEVICE check in memremap_pages | expand |
On Sun, Feb 6, 2022 at 10:33 PM Christoph Hellwig <hch@lst.de> wrote: > > memremap.c is only built when CONFIG_ZONE_DEVICE is set, so remove > the superflous extra check. Looks good to me. Reviewed-by: Dan Williams <dan.j.williams@intel.com>
On Mon, Feb 07, 2022 at 07:32:42AM +0100, Christoph Hellwig wrote: > memremap.c is only built when CONFIG_ZONE_DEVICE is set, so remove > the superflous extra check. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > mm/memremap.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Jason
On 2/6/22 10:32 PM, Christoph Hellwig wrote: > memremap.c is only built when CONFIG_ZONE_DEVICE is set, so remove > the superflous extra check. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > mm/memremap.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/memremap.c b/mm/memremap.c > index 6aa5f0c2d11fda..5f04a0709e436e 100644 > --- a/mm/memremap.c > +++ b/mm/memremap.c > @@ -328,8 +328,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) > } > break; > case MEMORY_DEVICE_FS_DAX: > - if (!IS_ENABLED(CONFIG_ZONE_DEVICE) || > - IS_ENABLED(CONFIG_FS_DAX_LIMITED)) { > + if (IS_ENABLED(CONFIG_FS_DAX_LIMITED)) { > WARN(1, "File system DAX not supported\n"); > return ERR_PTR(-EINVAL); > } > Indeed it does have it in the makefile:- root@dev mm (for-next) # grep memremap.o Makefile obj-$(CONFIG_ZONE_DEVICE) += memremap.o Looks good. Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
On Mon, Feb 7, 2022 at 2:36 PM Christoph Hellwig <hch@lst.de> wrote: > > memremap.c is only built when CONFIG_ZONE_DEVICE is set, so remove > the superflous extra check. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Muchun Song <songmuchun@bytedance.com> Thanks.
diff --git a/mm/memremap.c b/mm/memremap.c index 6aa5f0c2d11fda..5f04a0709e436e 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -328,8 +328,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) } break; case MEMORY_DEVICE_FS_DAX: - if (!IS_ENABLED(CONFIG_ZONE_DEVICE) || - IS_ENABLED(CONFIG_FS_DAX_LIMITED)) { + if (IS_ENABLED(CONFIG_FS_DAX_LIMITED)) { WARN(1, "File system DAX not supported\n"); return ERR_PTR(-EINVAL); }
memremap.c is only built when CONFIG_ZONE_DEVICE is set, so remove the superflous extra check. Signed-off-by: Christoph Hellwig <hch@lst.de> --- mm/memremap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)