The patch titled
     sparsemem: fix sparse_index_init return check
has been removed from the -mm tree.  Its filename was
     mm-sparsec-improve-the-error-handling-for-sparse_add_one_section-fix.patch

This patch was dropped because it was folded into 
mm-sparsec-improve-the-error-handling-for-sparse_add_one_section.patch

------------------------------------------------------
Subject: sparsemem: fix sparse_index_init return check
From: Geoff Levand <[EMAIL PROTECTED]>

sparse_index_init() returns -EEXIST to indicate the index has already been
created.  Exclude this from the error check on the return value.

Signed-off-by: Geoff Levand <[EMAIL PROTECTED]>
Cc: Christoph Lameter <[EMAIL PROTECTED]>
Cc: Dave Hansen <[EMAIL PROTECTED]>
Cc: Rik van Riel <[EMAIL PROTECTED]>
Cc: Yasunori Goto <[EMAIL PROTECTED]>
Cc: Andy Whitcroft <[EMAIL PROTECTED]>
Cc: WANG Cong <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 mm/sparse.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN 
mm/sparse.c~mm-sparsec-improve-the-error-handling-for-sparse_add_one_section-fix
 mm/sparse.c
--- 
a/mm/sparse.c~mm-sparsec-improve-the-error-handling-for-sparse_add_one_section-fix
+++ a/mm/sparse.c
@@ -384,7 +384,7 @@ int sparse_add_one_section(struct zone *
         * plus, it does a kmalloc
         */
        ret = sparse_index_init(section_nr, pgdat->node_id);
-       if (ret < 0)
+       if (ret < 0 && ret != -EEXIST)
                return ret;
        memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, nr_pages);
        if (!memmap)
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

sparsemem-make-sparsemem_vmemmap-selectable.patch
mm-sparsec-improve-the-error-handling-for-sparse_add_one_section.patch
mm-sparsec-improve-the-error-handling-for-sparse_add_one_section-fix.patch
git-powerpc.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to