The patch titled
Subject: powerpc: remove duplicated alloc_stack() function
has been removed from the -mm tree. Its filename was
powerpc-use-memblock-functions-returning-virtual-address-fix.patch
This patch was dropped because it was folded into powerpc-use-memblock-functions-returning-virtual-address.patch
------------------------------------------------------
From: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Subject: powerpc: remove duplicated alloc_stack() function
The patch "powerpc: use memblock functions returning virtual address" was
applied in both powerpc and mmotm trees and as a result function
alloc_stack() sneaked twice into arch/powerpc/kernel/setup_32.c
Remove one of the copies.
Link: http://lkml.kernel.org/r/20190226064032.GA5873@rapoport-lnx
Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kernel/setup_32.c | 11 -----------
1 file changed, 11 deletions(-)
--- a/arch/powerpc/kernel/setup_32.c~powerpc-use-memblock-functions-returning-virtual-address-fix
+++ a/arch/powerpc/kernel/setup_32.c
@@ -173,17 +173,6 @@ static void *__init alloc_stack(void)
return ptr;
}
-static void *__init alloc_stack(void)
-{
- void *ptr = memblock_alloc(THREAD_SIZE, THREAD_SIZE);
-
- if (!ptr)
- panic("cannot allocate %d bytes for stack at %pS\n",
- THREAD_SIZE, (void *)_RET_IP_);
-
- return ptr;
-}
-
void __init irqstack_early_init(void)
{
unsigned int i;
_
Patches currently in -mm which might be from rppt@xxxxxxxxxxxxx are
openrisc-prefer-memblock-apis-returning-virtual-address.patch
powerpc-use-memblock-functions-returning-virtual-address.patch
memblock-replace-memblock_alloc_baseanywhere-with-memblock_phys_alloc.patch
memblock-drop-memblock_alloc_base_nid.patch
memblock-emphasize-that-memblock_alloc_range-returns-a-physical-address.patch
memblock-memblock_phys_alloc_try_nid-dont-panic.patch
memblock-memblock_phys_alloc-dont-panic.patch
memblock-drop-__memblock_alloc_base.patch
memblock-drop-memblock_alloc_base.patch
memblock-refactor-internal-allocation-functions.patch
memblock-refactor-internal-allocation-functions-fix.patch
memblock-make-memblock_find_in_range_node-and-choose_memblock_flags-static.patch
arch-use-memblock_alloc-instead-of-memblock_alloc_fromsize-align-0.patch
arch-dont-memset0-memory-returned-by-memblock_alloc.patch
ia64-add-checks-for-the-return-value-of-memblock_alloc.patch
sparc-add-checks-for-the-return-value-of-memblock_alloc.patch
mm-percpu-add-checks-for-the-return-value-of-memblock_alloc.patch
init-main-add-checks-for-the-return-value-of-memblock_alloc.patch
swiotlb-add-checks-for-the-return-value-of-memblock_alloc.patch
treewide-add-checks-for-the-return-value-of-memblock_alloc.patch
treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-2.patch
treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-3.patch
memblock-memblock_alloc_try_nid-dont-panic.patch
memblock-drop-memblock_alloc__nopanic-variants.patch
memblock-remove-memblock_setclear_region_flags.patch
memblock-split-checks-whether-a-region-should-be-skipped-to-a-helper-function.patch
memblock-update-comments-and-kernel-doc.patch
of-fix-kmemleak-crash-caused-by-imbalance-in-early-memory-reservation.patch
of-fix-kmemleak-crash-caused-by-imbalance-in-early-memory-reservation-fix.patch
