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

Commit dcd6c87c authored by Guenter Roeck's avatar Guenter Roeck Committed by Linus Torvalds
Browse files

mm: arch: remove duplicate definitions of MADV_FREE 



Commits 21f55b01 ("arch/*/include/uapi/asm/mman.h: : let MADV_FREE
have same value for all architectures") and ef58978f ("mm: define
MADV_FREE for some arches") both defined MADV_FREE, but did not use the
same values.  This results in build errors such as

  ./arch/alpha/include/uapi/asm/mman.h:53:0: error: "MADV_FREE" redefined
  ./arch/alpha/include/uapi/asm/mman.h:50:0: note: this is the location of the previous definition

for the affected architectures.

Fixes: 21f55b01 ("arch/*/include/uapi/asm/mman.h: : let MADV_FREE have same value for all architectures")
Fixes: ef58978f ("mm: define MADV_FREE for some arches")
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Chen Gang <gang.chen.5i5j@gmail.com>
Cc: Minchan Kim <minchan@kernel.org>
Acked-by: Helge Deller <deller@gmx.de>	[parisc]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f4be6153

arch/alpha/include/uapi/asm/mman.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ 
#define MADV_WILLNEED	3		/* will need these pages */

#define MADV_WILLNEED	3		/* will need these pages */

#define	MADV_SPACEAVAIL	5		/* ensure resources are available */

#define	MADV_SPACEAVAIL	5		/* ensure resources are available */

#define MADV_DONTNEED	6		/* don't need these pages */

#define MADV_DONTNEED	6		/* don't need these pages */

#define MADV_FREE	7		/* free pages only if memory pressure */





/* common/generic parameters */

/* common/generic parameters */

#define MADV_FREE	8		/* free pages only if memory pressure */

#define MADV_FREE	8		/* free pages only if memory pressure */

arch/mips/include/uapi/asm/mman.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,6 @@ 
#define MADV_SEQUENTIAL 2		/* expect sequential page references */

#define MADV_SEQUENTIAL 2		/* expect sequential page references */

#define MADV_WILLNEED	3		/* will need these pages */

#define MADV_WILLNEED	3		/* will need these pages */

#define MADV_DONTNEED	4		/* don't need these pages */

#define MADV_DONTNEED	4		/* don't need these pages */

#define MADV_FREE	5		/* free pages only if memory pressure */





/* common parameters: try to keep these consistent across architectures */

/* common parameters: try to keep these consistent across architectures */

#define MADV_FREE	8		/* free pages only if memory pressure */

#define MADV_FREE	8		/* free pages only if memory pressure */

arch/parisc/include/uapi/asm/mman.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,6 @@ 
#define MADV_SPACEAVAIL 5               /* insure that resources are reserved */

#define MADV_SPACEAVAIL 5               /* insure that resources are reserved */

#define MADV_VPS_PURGE  6               /* Purge pages from VM page cache */

#define MADV_VPS_PURGE  6               /* Purge pages from VM page cache */

#define MADV_VPS_INHERIT 7              /* Inherit parents page size */

#define MADV_VPS_INHERIT 7              /* Inherit parents page size */

#define MADV_FREE	8		/* free pages only if memory pressure */





/* common/generic parameters */

/* common/generic parameters */

#define MADV_FREE	8		/* free pages only if memory pressure */

#define MADV_FREE	8		/* free pages only if memory pressure */

arch/xtensa/include/uapi/asm/mman.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,6 @@ 
#define MADV_SEQUENTIAL	2		/* expect sequential page references */

#define MADV_SEQUENTIAL	2		/* expect sequential page references */

#define MADV_WILLNEED	3		/* will need these pages */

#define MADV_WILLNEED	3		/* will need these pages */

#define MADV_DONTNEED	4		/* don't need these pages */

#define MADV_DONTNEED	4		/* don't need these pages */

#define MADV_FREE	5		/* free pages only if memory pressure */





/* common parameters: try to keep these consistent across architectures */

/* common parameters: try to keep these consistent across architectures */

#define MADV_FREE	8		/* free pages only if memory pressure */

#define MADV_FREE	8		/* free pages only if memory pressure */