The patch titled
Subject: mm/memblock.c: use dump_stack() instead of WARN_ON_ONCE for the alignment checks
has been removed from the -mm tree. Its filename was
memblock-warn-if-zero-alignment-was-requested-fix.patch
This patch was dropped because it was folded into memblock-warn-if-zero-alignment-was-requested.patch
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: mm/memblock.c: use dump_stack() instead of WARN_ON_ONCE for the alignment checks
Using WARN_ON_ONCE too early causes the PowerPC kernel to fail.
Link: http://lkml.kernel.org/r/20181016131927.6ceba6ab@xxxxxxxxxxxxxxxx
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memblock.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/mm/memblock.c~memblock-warn-if-zero-alignment-was-requested-fix
+++ a/mm/memblock.c
@@ -1247,8 +1247,10 @@ static phys_addr_t __init memblock_alloc
{
phys_addr_t found;
- if (WARN_ON_ONCE(!align))
+ if (!align) {
+ dump_stack();
align = SMP_CACHE_BYTES;
+ }
found = memblock_find_in_range_node(size, align, start, end, nid,
flags);
@@ -1372,8 +1374,10 @@ static void * __init memblock_alloc_inte
if (WARN_ON_ONCE(slab_is_available()))
return kzalloc_node(size, GFP_NOWAIT, nid);
- if (WARN_ON_ONCE(!align))
+ if (!align) {
+ dump_stack();
align = SMP_CACHE_BYTES;
+ }
if (max_addr > memblock.current_limit)
max_addr = memblock.current_limit;
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
memblock-warn-if-zero-alignment-was-requested.patch
