2 files changed, 6 insertions, 3 deletions

diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index 9e65d9e20662..6f6df86f1ae5 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -277,7 +277,10 @@ struct mdp_superblock_1 {
                                            */
 #define MD_FEATURE_RESHAPE_ACTIVE       4
 #define MD_FEATURE_BAD_BLOCKS           8 /* badblock list is not empty */
-
-#define MD_FEATURE_ALL                  (1|2|4|8)
+#define MD_FEATURE_REPLACEMENT          16 /* This device is replacing an
+                                            * active device with same 'role'.
+                                            * 'recovery_offset' is also set.
+                                            */
+#define MD_FEATURE_ALL                  (1|2|4|8|16)
 
 #endif 
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 2b59cc824395..53272e9860a7 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -132,7 +132,7 @@ void raid6_dual_recov(int disks, size_t bytes, int faila, int failb,
                                                      PROT_READ|PROT_WRITE,   \
                                                      MAP_PRIVATE|MAP_ANONYMOUS,\
                                                      0, 0))
-# define free_pages(x, y)       munmap((void *)(x), (y)*PAGE_SIZE)
+# define free_pages(x, y)       munmap((void *)(x), PAGE_SIZE << (y))
 
 static inline void cpu_relax(void)
 {