Commit fa277171 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: drop memblock_free_early_nid() and memblock_free_early() 

memblock_free_early_nid() is unused and memblock_free_early() is an
alias for memblock_free().

Replace calls to memblock_free_early() with calls to memblock_free() and
remove memblock_free_early() and memblock_free_early_nid().

Link: https://lkml.kernel.org/r/20210930185031.18648-4-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Juergen Gross <jgross@suse.com>
Cc: Shahab Vahedi <Shahab.Vahedi@synopsys.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c486514d

arch/mips/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, 


static void __init pcpu_fc_free(void *ptr, size_t size)

{

	memblock_free_early(__pa(ptr), size);

	memblock_free(__pa(ptr), size);

}



void __init setup_per_cpu_areas(void)

arch/powerpc/platforms/pseries/svm.c

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ void __init svm_swiotlb_init(void) 
		return;





	memblock_free_early(__pa(vstart),

			    PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));

	memblock_free(__pa(vstart), PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));

	panic("SVM: Cannot allocate SWIOTLB buffer");

}

arch/s390/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ void __init smp_detect_cpus(void) 


	/* Add CPUs present at boot */

	__smp_rescan_cpus(info, true);

	memblock_free_early((unsigned long)info, sizeof(*info));

	memblock_free((unsigned long)info, sizeof(*info));

}



/*

drivers/base/arch_numa.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, 


static void __init pcpu_fc_free(void *ptr, size_t size)

{

	memblock_free_early(__pa(ptr), size);

	memblock_free(__pa(ptr), size);

}



#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK

drivers/s390/char/sclp_early.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int __init sclp_early_get_core_info(struct sclp_core_info *info) 
	}

	sclp_fill_core_info(info, sccb);

out:

	memblock_free_early((unsigned long)sccb, length);

	memblock_free((unsigned long)sccb, length);

	return rc;

}