move MREMAP_MAYMOVE and MREMAP_FIXED out of bits

the definitions are generic for all kernel archs. exposure of these
macros now only occurs on the same feature test as for the function
accepting them, which is believed to be more correct.

arch/arm/bits/mman.h

@@ -55,7 +55,4 @@
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
 #define MADV_SOFT_OFFLINE 101
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

arch/i386/bits/mman.h

@@ -56,7 +56,4 @@
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
 #define MADV_SOFT_OFFLINE 101
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

arch/microblaze/bits/mman.h

@@ -55,7 +55,4 @@
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
 #define MADV_SOFT_OFFLINE 101
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

arch/mips/bits/mman.h

@@ -54,7 +54,4 @@
 #define MADV_DONTDUMP    16
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

arch/or1k/bits/mman.h

@@ -55,7 +55,4 @@
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
 #define MADV_SOFT_OFFLINE 101
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

arch/powerpc/bits/mman.h

@@ -55,7 +55,4 @@
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
 #define MADV_SOFT_OFFLINE 101
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

arch/sh/bits/mman.h

@@ -56,7 +56,4 @@
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
 #define MADV_SOFT_OFFLINE 101
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

arch/x32/bits/mman.h

@@ -56,7 +56,4 @@
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
 #define MADV_SOFT_OFFLINE 101
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

arch/x86_64/bits/mman.h

@@ -56,7 +56,4 @@
 #define MADV_DODUMP      17
 #define MADV_HWPOISON    100
 #define MADV_SOFT_OFFLINE 101
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
 #endif

include/sys/mman.h

@@ -32,6 +32,8 @@ int mlockall (int);
 int munlockall (void);
 
 #ifdef _GNU_SOURCE
+#define MREMAP_MAYMOVE 1
+#define MREMAP_FIXED 2
 void *mremap (void *, size_t, size_t, int, ...);
 int remap_file_pages (void *, size_t, int, size_t, int);
 #endif