Merge branch 'master' into for-next

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/flex_array.h b/include/linux/flex_array.h
index 6843cf193a44..b6efb0c64408 100644
--- a/include/linux/flex_array.h
+++ b/include/linux/flex_array.h
@@ -2,6 +2,7 @@
 #define _FLEX_ARRAY_H
 
 #include <linux/types.h>
+#include <linux/reciprocal_div.h>
 #include <asm/page.h>
 
 #define FLEX_ARRAY_PART_SIZE PAGE_SIZE
@@ -22,7 +23,7 @@ struct flex_array {
                         int element_size;
                         int total_nr_elements;
                         int elems_per_part;
-                        u32 reciprocal_elems;
+                        struct reciprocal_value reciprocal_elems;
                         struct flex_array_part *parts[];
                 };
                 /*