From dcd6c87cc59af1b4fe7664b35c6344bbe1c9928f Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Wed, 20 Jan 2016 14:58:15 -0800 Subject: mm: arch: remove duplicate definitions of MADV_FREE Commits 21f55b018ba5 ("arch/*/include/uapi/asm/mman.h: : let MADV_FREE have same value for all architectures") and ef58978f1eaa ("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: 21f55b018ba5 ("arch/*/include/uapi/asm/mman.h: : let MADV_FREE have same value for all architectures") Fixes: ef58978f1eaa ("mm: define MADV_FREE for some arches") Signed-off-by: Guenter Roeck Cc: Chen Gang Cc: Minchan Kim Acked-by: Helge Deller [parisc] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/parisc/include/uapi/asm/mman.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/parisc/include/uapi/asm/mman.h') diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h index cf830d465f75..f3db7d8eb0c2 100644 --- a/arch/parisc/include/uapi/asm/mman.h +++ b/arch/parisc/include/uapi/asm/mman.h @@ -43,7 +43,6 @@ #define MADV_SPACEAVAIL 5 /* insure that resources are reserved */ #define MADV_VPS_PURGE 6 /* Purge pages from VM page cache */ #define MADV_VPS_INHERIT 7 /* Inherit parents page size */ -#define MADV_FREE 8 /* free pages only if memory pressure */ /* common/generic parameters */ #define MADV_FREE 8 /* free pages only if memory pressure */ -- cgit v1.2.3