| Message ID | 1569312010-31313-1-git-send-email-anshuman.khandual@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm/memremap: Drop unused SECTION_SIZE and SECTION_MASK | expand |
On 24.09.19 10:00, Anshuman Khandual wrote: > SECTION_SIZE and SECTION_MASK macros are not getting used anymore. But they > do conflict with existing definitions on arm64 platform causing following > warning during build. Lets drop these unused macros. > > mm/memremap.c:16: warning: "SECTION_MASK" redefined > #define SECTION_MASK ~((1UL << PA_SECTION_SHIFT) - 1) > > In file included from ./arch/arm64/include/asm/processor.h:34, > from ./include/linux/mutex.h:19, > from ./include/linux/kernfs.h:12, > from ./include/linux/sysfs.h:16, > from ./include/linux/kobject.h:20, > from ./include/linux/device.h:16, > from mm/memremap.c:3: > ./arch/arm64/include/asm/pgtable-hwdef.h:79: note: this is the location of > the previous definition > #define SECTION_MASK (~(SECTION_SIZE-1)) > > mm/memremap.c:17: warning: "SECTION_SIZE" redefined > #define SECTION_SIZE (1UL << PA_SECTION_SHIFT) > > In file included from ./arch/arm64/include/asm/processor.h:34, > from ./include/linux/mutex.h:19, > from ./include/linux/kernfs.h:12, > from ./include/linux/sysfs.h:16, > from ./include/linux/kobject.h:20, > from ./include/linux/device.h:16, > from mm/memremap.c:3: > ./arch/arm64/include/asm/pgtable-hwdef.h:78: note: this is the location of > the previous definition > #define SECTION_SIZE (_AC(1, UL) << SECTION_SHIFT) > > Cc: Dan Williams <dan.j.williams@intel.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Jason Gunthorpe <jgg@ziepe.ca> > Cc: Logan Gunthorpe <logang@deltatee.com> > Cc: Ira Weiny <ira.weiny@intel.com> > Cc: linux-kernel@vger.kernel.org > Reported-by: kbuild test robot <lkp@intel.com> > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > Build and boot tested on arm64 platform with ZONE_DEVICE enabled. But > only boot tested on arm64 and some other platforms with allmodconfig. > > mm/memremap.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/mm/memremap.c b/mm/memremap.c > index f6c17339cd0d..bf2882bfbf48 100644 > --- a/mm/memremap.c > +++ b/mm/memremap.c > @@ -13,8 +13,6 @@ > #include <linux/xarray.h> > > static DEFINE_XARRAY(pgmap_array); > -#define SECTION_MASK ~((1UL << PA_SECTION_SHIFT) - 1) > -#define SECTION_SIZE (1UL << PA_SECTION_SHIFT) > > #ifdef CONFIG_DEV_PAGEMAP_OPS > DEFINE_STATIC_KEY_FALSE(devmap_managed_key); > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/mm/memremap.c b/mm/memremap.c index f6c17339cd0d..bf2882bfbf48 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -13,8 +13,6 @@ #include <linux/xarray.h> static DEFINE_XARRAY(pgmap_array); -#define SECTION_MASK ~((1UL << PA_SECTION_SHIFT) - 1) -#define SECTION_SIZE (1UL << PA_SECTION_SHIFT) #ifdef CONFIG_DEV_PAGEMAP_OPS DEFINE_STATIC_KEY_FALSE(devmap_managed_key);
SECTION_SIZE and SECTION_MASK macros are not getting used anymore. But they do conflict with existing definitions on arm64 platform causing following warning during build. Lets drop these unused macros. mm/memremap.c:16: warning: "SECTION_MASK" redefined #define SECTION_MASK ~((1UL << PA_SECTION_SHIFT) - 1) In file included from ./arch/arm64/include/asm/processor.h:34, from ./include/linux/mutex.h:19, from ./include/linux/kernfs.h:12, from ./include/linux/sysfs.h:16, from ./include/linux/kobject.h:20, from ./include/linux/device.h:16, from mm/memremap.c:3: ./arch/arm64/include/asm/pgtable-hwdef.h:79: note: this is the location of the previous definition #define SECTION_MASK (~(SECTION_SIZE-1)) mm/memremap.c:17: warning: "SECTION_SIZE" redefined #define SECTION_SIZE (1UL << PA_SECTION_SHIFT) In file included from ./arch/arm64/include/asm/processor.h:34, from ./include/linux/mutex.h:19, from ./include/linux/kernfs.h:12, from ./include/linux/sysfs.h:16, from ./include/linux/kobject.h:20, from ./include/linux/device.h:16, from mm/memremap.c:3: ./arch/arm64/include/asm/pgtable-hwdef.h:78: note: this is the location of the previous definition #define SECTION_SIZE (_AC(1, UL) << SECTION_SHIFT) Cc: Dan Williams <dan.j.williams@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Logan Gunthorpe <logang@deltatee.com> Cc: Ira Weiny <ira.weiny@intel.com> Cc: linux-kernel@vger.kernel.org Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- Build and boot tested on arm64 platform with ZONE_DEVICE enabled. But only boot tested on arm64 and some other platforms with allmodconfig. mm/memremap.c | 2 -- 1 file changed, 2 deletions(-)