Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[mirror_ubuntu-artful-kernel.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index db6bf3c97ea2cd7e593922ab88840b84d67cdd88..6903c8fc308502eab4ca3570075cd6a881efa724 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -248,10 +248,7 @@ static int __meminit sparse_init_one_section(struct mem_section *ms,
 
 unsigned long usemap_size(void)
 {
-       unsigned long size_bytes;
-       size_bytes = roundup(SECTION_BLOCKFLAGS_BITS, 8) / 8;
-       size_bytes = roundup(size_bytes, sizeof(unsigned long));
-       return size_bytes;
+       return BITS_TO_LONGS(SECTION_BLOCKFLAGS_BITS) * sizeof(unsigned long);
 }
 
 #ifdef CONFIG_MEMORY_HOTPLUG