| Message ID | 20171018083226.3124972-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | mm: mark mm_pgtables_bytes() argument as const | expand |
On Wed, Oct 18, 2017 at 10:31:17AM +0200, Arnd Bergmann wrote: > The newly introduced mm_pgtables_bytes() function has two > definitions with slightly different prototypes. The one > used for CONFIG_MMU=n causes a compile-time warning: > > In file included from include/linux/kernel.h:13:0, > from mm/debug.c:8: > mm/debug.c: In function 'dump_mm': > mm/debug.c:137:21: error: passing argument 1 of 'mm_pgtables_bytes' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] > > This changes it to be the same as the other one and avoid the > warning. > > Fixes: 7444e6ee9cce ("mm: consolidate page table accounting") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> The fix is already in mmots: http://ozlabs.org/~akpm/mmots/broken-out/mm-consolidate-page-table-accounting-fix.patch -- Kirill A. Shutemov
diff --git a/include/linux/mm.h b/include/linux/mm.h index f7db128d2c59..2067dc7d03e7 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1677,7 +1677,7 @@ static inline void mm_dec_nr_ptes(struct mm_struct *mm) #else static inline void mm_pgtables_bytes_init(struct mm_struct *mm) {} -static inline unsigned long mm_pgtables_bytes(struct mm_struct *mm) +static inline unsigned long mm_pgtables_bytes(const struct mm_struct *mm) { return 0; }
The newly introduced mm_pgtables_bytes() function has two definitions with slightly different prototypes. The one used for CONFIG_MMU=n causes a compile-time warning: In file included from include/linux/kernel.h:13:0, from mm/debug.c:8: mm/debug.c: In function 'dump_mm': mm/debug.c:137:21: error: passing argument 1 of 'mm_pgtables_bytes' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] This changes it to be the same as the other one and avoid the warning. Fixes: 7444e6ee9cce ("mm: consolidate page table accounting") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/linux/mm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0