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.

diff --git a/arch/arm/bits/mman.h b/arch/arm/bits/mman.h
index 8c4110f17d2426843ca69fdb1c32d7a86994ef90..cc854aaee8aafdccb70b1c90a7604ffc49948544 100644 (file)
--- a/arch/arm/bits/mman.h
+++ b/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

diff --git a/arch/i386/bits/mman.h b/arch/i386/bits/mman.h
index add638557408e25c00c8433d51736f83eee3210f..0f53acb7abcb0e60ef1cc7c71318c6fc68f089d5 100644 (file)
--- a/arch/i386/bits/mman.h
+++ b/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

diff --git a/arch/microblaze/bits/mman.h b/arch/microblaze/bits/mman.h
index 8c4110f17d2426843ca69fdb1c32d7a86994ef90..cc854aaee8aafdccb70b1c90a7604ffc49948544 100644 (file)
--- a/arch/microblaze/bits/mman.h
+++ b/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

diff --git a/arch/mips/bits/mman.h b/arch/mips/bits/mman.h
index ac8dd5e532a522c35e51308a62091f95c739c362..3125fc2b30fe4af4137f65781858e8351f601c23 100644 (file)
--- a/arch/mips/bits/mman.h
+++ b/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

diff --git a/arch/or1k/bits/mman.h b/arch/or1k/bits/mman.h
index 8c4110f17d2426843ca69fdb1c32d7a86994ef90..cc854aaee8aafdccb70b1c90a7604ffc49948544 100644 (file)
--- a/arch/or1k/bits/mman.h
+++ b/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

diff --git a/arch/powerpc/bits/mman.h b/arch/powerpc/bits/mman.h
index 15e3049eb3e62b4795633ef60d7321e3266f89d3..fe8de2b9d6a35cee2244852af2f4802dfe5896bf 100644 (file)
--- a/arch/powerpc/bits/mman.h
+++ b/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

diff --git a/arch/sh/bits/mman.h b/arch/sh/bits/mman.h
index f199f4b47f277f3e15ba7ce58f78addde1ad89b1..f6fc98f04544d4dff8219adfe33364b123196c7e 100644 (file)
--- a/arch/sh/bits/mman.h
+++ b/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

diff --git a/arch/x32/bits/mman.h b/arch/x32/bits/mman.h
index dcab47a4862fe6284acf14a56b0b0828297dd9ad..846b7eaee8a1045152d592d843424d762402a311 100644 (file)
--- a/arch/x32/bits/mman.h
+++ b/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

diff --git a/arch/x86_64/bits/mman.h b/arch/x86_64/bits/mman.h
index dcab47a4862fe6284acf14a56b0b0828297dd9ad..846b7eaee8a1045152d592d843424d762402a311 100644 (file)
--- a/arch/x86_64/bits/mman.h
+++ b/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

diff --git a/include/sys/mman.h b/include/sys/mman.h
index a34448a6e5c4f7783a0203d594775b726add87f8..9fc2db51d174e96a790623584539c71ac1f086c4 100644 (file)
--- a/include/sys/mman.h
+++ b/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