Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[karo-tx-linux.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index 3194ec414728ffab13034cf0082ce2a6dff77a0b..b38400f0fb8d9527f2d4b3b97e6ac77f3fb084d7 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -79,7 +79,6 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid)
 {
        unsigned long root = SECTION_NR_TO_ROOT(section_nr);
        struct mem_section *section;
-       int ret = 0;
 
        if (mem_section[root])
                return -EEXIST;
@@ -90,7 +89,7 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid)
 
        mem_section[root] = section;
 
-       return ret;
+       return 0;
 }
 #else /* !SPARSEMEM_EXTREME */
 static inline int sparse_index_init(unsigned long section_nr, int nid)