The patch titled
Subject: mm: arch: remove duplicate definitions of MADV_FREE
has been removed from the -mm tree. Its filename was
mm-remove-duplicate-definitions-of-madv_free.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Guenter Roeck <linux@xxxxxxxxxxxx>
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 <linux@xxxxxxxxxxxx>
Cc: Chen Gang <gang.chen.5i5j@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Acked-by: Helge Deller <deller@xxxxxx> [parisc]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/include/uapi/asm/mman.h | 1 -
arch/mips/include/uapi/asm/mman.h | 1 -
arch/parisc/include/uapi/asm/mman.h | 1 -
arch/xtensa/include/uapi/asm/mman.h | 1 -
4 files changed, 4 deletions(-)
diff -puN arch/alpha/include/uapi/asm/mman.h~mm-remove-duplicate-definitions-of-madv_free arch/alpha/include/uapi/asm/mman.h
--- a/arch/alpha/include/uapi/asm/mman.h~mm-remove-duplicate-definitions-of-madv_free
+++ a/arch/alpha/include/uapi/asm/mman.h
@@ -47,7 +47,6 @@
#define MADV_WILLNEED 3 /* will need these pages */
#define MADV_SPACEAVAIL 5 /* ensure resources are available */
#define MADV_DONTNEED 6 /* don't need these pages */
-#define MADV_FREE 7 /* free pages only if memory pressure */
/* common/generic parameters */
#define MADV_FREE 8 /* free pages only if memory pressure */
diff -puN arch/mips/include/uapi/asm/mman.h~mm-remove-duplicate-definitions-of-madv_free arch/mips/include/uapi/asm/mman.h
--- a/arch/mips/include/uapi/asm/mman.h~mm-remove-duplicate-definitions-of-madv_free
+++ a/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 */
diff -puN arch/parisc/include/uapi/asm/mman.h~mm-remove-duplicate-definitions-of-madv_free arch/parisc/include/uapi/asm/mman.h
--- a/arch/parisc/include/uapi/asm/mman.h~mm-remove-duplicate-definitions-of-madv_free
+++ a/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 */
diff -puN arch/xtensa/include/uapi/asm/mman.h~mm-remove-duplicate-definitions-of-madv_free arch/xtensa/include/uapi/asm/mman.h
--- a/arch/xtensa/include/uapi/asm/mman.h~mm-remove-duplicate-definitions-of-madv_free
+++ a/arch/xtensa/include/uapi/asm/mman.h
@@ -86,7 +86,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 */
_
Patches currently in -mm which might be from linux@xxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
