[folded-merged] mm-vmalloc-improve-allocation-failure-error-messages-fix.patch removed from -mm tree

[folded-merged] mm-vmalloc-improve-allocation-failure-error-messages-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm/vmalloc: print correct vmalloc allocation size
has been removed from the -mm tree.  Its filename was
     mm-vmalloc-improve-allocation-failure-error-messages-fix.patch

This patch was dropped because it was folded into mm-vmalloc-improve-allocation-failure-error-messages.patch

------------------------------------------------------
From: "Uladzislau Rezki (Sony)" <urezki@gmail.com>
Subject: mm/vmalloc: print correct vmalloc allocation size

On entry the area->nr_pages is not set yet and is zero, thus when an
allocation of the page-table array fails the vmalloc size will not be
reflected correctly in a error message.

Replace area->nr_pages by the nr_small_pages.

Link: https://lkml.kernel.org/r/20210329193214.GA28602@pc638.lan
Fixes: 014ccf9b888d ("mm/vmalloc: improve allocation failure error messages")
Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
Reported-by: Colin King <colin.king@canonical.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

--- a/mm/vmalloc.c~mm-vmalloc-improve-allocation-failure-error-messages-fix
+++ a/mm/vmalloc.c
@@ -2793,7 +2793,7 @@ static void *__vmalloc_area_node(struct
 		warn_alloc(gfp_mask, NULL,
 			   "vmalloc size %lu allocation failure: "
 			   "page array size %lu allocation failed",
-			   area->nr_pages * PAGE_SIZE, array_size);
+			   nr_small_pages * PAGE_SIZE, array_size);
 		return NULL;
 	}
 
_

Patches currently in -mm which might be from urezki@gmail.com are

mm-vmalloc-improve-allocation-failure-error-messages.patch
lib-test_vmallocc-remove-two-kvfree_rcu-tests.patch
lib-test_vmallocc-add-a-new-nr_threads-parameter.patch
lib-test_vmallocc-add-a-new-nr_threads-parameter-fix.patch
vm-test_vmallocsh-adapt-for-updated-driver-interface.patch
mm-vmalloc-refactor-the-preloading-loagic.patch
mm-vmalloc-remove-an-empty-line.patch