Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d016bf7e authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

mm: make FIRST_USER_ADDRESS unsigned long on all archs 



LKP has triggered a compiler warning after my recent patch "mm: account
pmd page tables to the process":

    mm/mmap.c: In function 'exit_mmap':
 >> mm/mmap.c:2857:2: warning: right shift count >= width of type [enabled by default]

The code:

 > 2857                WARN_ON(mm_nr_pmds(mm) >
   2858                                round_up(FIRST_USER_ADDRESS, PUD_SIZE) >> PUD_SHIFT);

In this, on tile, we have FIRST_USER_ADDRESS defined as 0.  round_up() has
the same type -- int.  PUD_SHIFT.

I think the best way to fix it is to define FIRST_USER_ADDRESS as unsigned
long.  On every arch for consistency.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reported-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3ae3ad4e

arch/alpha/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct vm_area_struct; 
#define PTRS_PER_PMD	(1UL << (PAGE_SHIFT-3))

#define PTRS_PER_PGD	(1UL << (PAGE_SHIFT-3))

#define USER_PTRS_PER_PGD	(TASK_SIZE / PGDIR_SIZE)

#define FIRST_USER_ADDRESS	0

#define FIRST_USER_ADDRESS	0UL



/* Number of pointers that fit on a page:  this will go away. */

#define PTRS_PER_PAGE	(1UL << (PAGE_SHIFT-3))

arch/arc/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ 
 * No special requirements for lowest virtual address we permit any user space

 * mapping to be mapped at.

 */

#define FIRST_USER_ADDRESS      0

#define FIRST_USER_ADDRESS      0UL





/****************************************************************

arch/arm/include/asm/pgtable-nommu.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ extern unsigned int kobjsize(const void *objp); 
#define	VMALLOC_START	0UL

#define	VMALLOC_END	0xffffffffUL



#define FIRST_USER_ADDRESS      (0)

#define FIRST_USER_ADDRESS      0UL



#include <asm-generic/pgtable.h>

arch/arm64/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


#define vmemmap			((struct page *)(VMALLOC_END + SZ_64K))



#define FIRST_USER_ADDRESS	0

#define FIRST_USER_ADDRESS	0UL



#ifndef __ASSEMBLY__

extern void __pte_error(const char *file, int line, unsigned long val);

arch/avr32/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define PGDIR_MASK	(~(PGDIR_SIZE-1))



#define USER_PTRS_PER_PGD	(TASK_SIZE / PGDIR_SIZE)

#define FIRST_USER_ADDRESS	0

#define FIRST_USER_ADDRESS	0UL



#ifndef __ASSEMBLY__

extern pgd_t swapper_pg_dir[PTRS_PER_PGD];