diff --git a/[refs] b/[refs]
index 083e7fdc5007..51c198eda0af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff3d58c22b6827039983911d3460cf0c1657f8cc
+refs/heads/master: 0faa56389c793cda7f967117415717bbab24fe4e
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index fd55f725a09e..f6f2c505fa7e 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -981,7 +981,7 @@ struct mem_section {
 #endif
 
 #define SECTION_NR_TO_ROOT(sec)	((sec) / SECTIONS_PER_ROOT)
-#define NR_SECTION_ROOTS	(NR_MEM_SECTIONS / SECTIONS_PER_ROOT)
+#define NR_SECTION_ROOTS	DIV_ROUND_UP(NR_MEM_SECTIONS, SECTIONS_PER_ROOT)
 #define SECTION_ROOT_MASK	(SECTIONS_PER_ROOT - 1)
 
 #ifdef CONFIG_SPARSEMEM_EXTREME