Skip to content

Commit 5bd0960

Browse files
rppttorvalds
authored andcommitted
memblock: remove unused memblock_mem_size()
The only user of memblock_mem_size() was x86 setup code, it is gone now and memblock_mem_size() funciton can be removed. Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Baoquan He <bhe@redhat.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Daniel Axtens <dja@axtens.net> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Emil Renner Berthing <kernel@esmil.dk> Cc: Hari Bathini <hbathini@linux.ibm.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Stafford Horne <shorne@gmail.com> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will@kernel.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Link: https://lkml.kernel.org/r/20200818151634.14343-16-rppt@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 6120cdc commit 5bd0960

2 files changed

Lines changed: 0 additions & 16 deletions

File tree

include/linux/memblock.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,6 @@ static inline bool memblock_bottom_up(void)
481481

482482
phys_addr_t memblock_phys_mem_size(void);
483483
phys_addr_t memblock_reserved_size(void);
484-
phys_addr_t memblock_mem_size(unsigned long limit_pfn);
485484
phys_addr_t memblock_start_of_DRAM(void);
486485
phys_addr_t memblock_end_of_DRAM(void);
487486
void memblock_enforce_memory_limit(phys_addr_t memory_limit);

mm/memblock.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,21 +1660,6 @@ phys_addr_t __init_memblock memblock_reserved_size(void)
16601660
return memblock.reserved.total_size;
16611661
}
16621662

1663-
phys_addr_t __init memblock_mem_size(unsigned long limit_pfn)
1664-
{
1665-
unsigned long pages = 0;
1666-
unsigned long start_pfn, end_pfn;
1667-
int i;
1668-
1669-
for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) {
1670-
start_pfn = min_t(unsigned long, start_pfn, limit_pfn);
1671-
end_pfn = min_t(unsigned long, end_pfn, limit_pfn);
1672-
pages += end_pfn - start_pfn;
1673-
}
1674-
1675-
return PFN_PHYS(pages);
1676-
}
1677-
16781663
/* lowest address */
16791664
phys_addr_t __init_memblock memblock_start_of_DRAM(void)
16801665
{

0 commit comments

Comments
 (0)