[PATCH] MIPS: fix double definition of MADV_FREE

[PATCH] MIPS: fix double definition of MADV_FREE

[Manuel Lauss]

Commit ef58978f1eaab140081ec1808d96ee06e933e760
("mm: define MADV_FREE for some arches") introduced MADV_FREE to MIPS,
commit 21f55b018ba57897f4d3590ecbe11516bdc540af
("arch/*/include/uapi/asm/mman.h: : let MADV_FREE have same value for all architectures")
added another instance, which resulted in this build error:

In file included from include/uapi/linux/mman.h:4:0,
                 from include/linux/mman.h:8,
                 from kernel/fork.c:28:
arch/mips/include/uapi/asm/mman.h:79:0: warning: "MADV_FREE" redefined
 #define MADV_FREE 8  /* free pages only if memory pressure */
 ^
arch/mips/include/uapi/asm/mman.h:76:0: note: this is the location of the previous definition
 #define MADV_FREE 5  /* free pages only if memory pressure */


This patch removes the "MADV_FREE 5" introduced by the first commit
("mm: define MADV_FREE for some arches").

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
 arch/mips/include/uapi/asm/mman.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/mips/include/uapi/asm/mman.h b/arch/mips/include/uapi/asm/mman.h
index b0ebe59..ccdcfcb 100644
--- a/arch/mips/include/uapi/asm/mman.h
+++ b/arch/mips/include/uapi/asm/mman.h
@@ -73,7 +73,6 @@
 #define MADV_SEQUENTIAL 2		/* expect sequential page references */
 #define MADV_WILLNEED	3		/* will 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 */
 #define MADV_FREE	8		/* free pages only if memory pressure */
-- 
2.7.0

Re: [PATCH] MIPS: fix double definition of MADV_FREE

[Ralf Baechle]

On Sat, Jan 23, 2016 at 10:33:43AM +0100, Manuel Lauss wrote:

> Commit ef58978f1eaab140081ec1808d96ee06e933e760
> ("mm: define MADV_FREE for some arches") introduced MADV_FREE to MIPS,
> commit 21f55b018ba57897f4d3590ecbe11516bdc540af
> ("arch/*/include/uapi/asm/mman.h: : let MADV_FREE have same value for all architectures")
> added another instance, which resulted in this build error:
> 
> In file included from include/uapi/linux/mman.h:4:0,
>                  from include/linux/mman.h:8,
>                  from kernel/fork.c:28:
> arch/mips/include/uapi/asm/mman.h:79:0: warning: "MADV_FREE" redefined
>  #define MADV_FREE 8  /* free pages only if memory pressure */
>  ^
> arch/mips/include/uapi/asm/mman.h:76:0: note: this is the location of the previous definition
>  #define MADV_FREE 5  /* free pages only if memory pressure */
> 
> 
> This patch removes the "MADV_FREE 5" introduced by the first commit
> ("mm: define MADV_FREE for some arches").

Guenter Roeck's commit dcd6c87cc59af1b4fe7664b35c6344bbe1c9928f
("mm: arch: remove duplicate definitions of MADV_FREE") already fixed the
issue.

Thanks,

  Ralf