mirror of
https://github.com/armbian/linux-cix.git
synced 2026-01-06 12:30:45 -08:00
mm: move mem_init_print_info() into mm_init()
mem_init_print_info() is called in mem_init() on each architecture, and pass NULL argument, so using void argument and move it into mm_init(). Link: https://lkml.kernel.org/r/20210317015210.33641-1-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Acked-by: Dave Hansen <dave.hansen@linux.intel.com> [x86] Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> [powerpc] Acked-by: David Hildenbrand <david@redhat.com> Tested-by: Anatoly Pugachev <matorola@gmail.com> [sparc64] Acked-by: Russell King <rmk+kernel@armlinux.org.uk> [arm] Acked-by: Mike Rapoport <rppt@linux.ibm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Guo Ren <guoren@kernel.org> Cc: Yoshinori Sato <ysato@users.osdn.me> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: "Peter Zijlstra" <peterz@infradead.org> Cc: Ingo Molnar <mingo@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
e2b5bcf9f5
commit
1f9d03c5e9
@@ -282,5 +282,4 @@ mem_init(void)
|
||||
set_max_mapnr(max_low_pfn);
|
||||
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
|
||||
memblock_free_all();
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
@@ -194,7 +194,6 @@ void __init mem_init(void)
|
||||
{
|
||||
memblock_free_all();
|
||||
highmem_init();
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
|
||||
@@ -316,8 +316,6 @@ void __init mem_init(void)
|
||||
|
||||
free_highpages();
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
|
||||
/*
|
||||
* Check boundaries twice: Some fundamental inconsistencies can
|
||||
* be detected at build time already.
|
||||
|
||||
@@ -491,8 +491,6 @@ void __init mem_init(void)
|
||||
/* this will put all unused low memory onto the freelists */
|
||||
memblock_free_all();
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
|
||||
/*
|
||||
* Check boundaries twice: Some fundamental inconsistencies can be
|
||||
* detected at build time already.
|
||||
|
||||
@@ -107,7 +107,6 @@ void __init mem_init(void)
|
||||
free_highmem_page(page);
|
||||
}
|
||||
#endif
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
void free_initmem(void)
|
||||
|
||||
@@ -98,6 +98,4 @@ void __init mem_init(void)
|
||||
|
||||
/* this will put all low memory onto the freelists */
|
||||
memblock_free_all();
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
@@ -55,7 +55,6 @@ void __init mem_init(void)
|
||||
{
|
||||
/* No idea where this is actually declared. Seems to evade LXR. */
|
||||
memblock_free_all();
|
||||
mem_init_print_info(NULL);
|
||||
|
||||
/*
|
||||
* To-Do: someone somewhere should wipe out the bootmem map
|
||||
|
||||
@@ -449,7 +449,6 @@ mem_init (void)
|
||||
set_max_mapnr(max_low_pfn);
|
||||
high_memory = __va(max_low_pfn * PAGE_SIZE);
|
||||
memblock_free_all();
|
||||
mem_init_print_info(NULL);
|
||||
|
||||
/*
|
||||
* For fsyscall entrpoints with no light-weight handler, use the ordinary
|
||||
|
||||
@@ -153,5 +153,4 @@ void __init mem_init(void)
|
||||
/* this will put all memory onto the freelists */
|
||||
memblock_free_all();
|
||||
init_pointer_tables();
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
@@ -131,7 +131,6 @@ void __init mem_init(void)
|
||||
highmem_setup();
|
||||
#endif
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
mem_init_done = 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -178,7 +178,6 @@ void __init mem_init(void)
|
||||
high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
|
||||
memblock_free_all();
|
||||
setup_zero_pages(); /* This comes from node 0 */
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
/* All PCI device belongs to logical Node-0 */
|
||||
|
||||
@@ -467,7 +467,6 @@ void __init mem_init(void)
|
||||
memblock_free_all();
|
||||
setup_zero_pages(); /* Setup zeroed pages. */
|
||||
mem_init_free_highmem();
|
||||
mem_init_print_info(NULL);
|
||||
|
||||
#ifdef CONFIG_64BIT
|
||||
if ((unsigned long) &_text > (unsigned long) CKSEG0)
|
||||
|
||||
@@ -420,5 +420,4 @@ void __init mem_init(void)
|
||||
high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
|
||||
memblock_free_all();
|
||||
setup_zero_pages(); /* This comes from node 0 */
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
@@ -191,7 +191,6 @@ void __init mem_init(void)
|
||||
|
||||
/* this will put all low memory onto the freelists */
|
||||
memblock_free_all();
|
||||
mem_init_print_info(NULL);
|
||||
|
||||
pr_info("virtual kernel memory layout:\n"
|
||||
" fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
|
||||
|
||||
@@ -71,7 +71,6 @@ void __init mem_init(void)
|
||||
|
||||
/* this will put all memory onto the freelists */
|
||||
memblock_free_all();
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
void __init mmu_init(void)
|
||||
|
||||
@@ -211,8 +211,6 @@ void __init mem_init(void)
|
||||
/* this will put all low memory onto the freelists */
|
||||
memblock_free_all();
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
|
||||
printk("mem_init_done ...........................................\n");
|
||||
mem_init_done = 1;
|
||||
return;
|
||||
|
||||
@@ -573,8 +573,6 @@ void __init mem_init(void)
|
||||
#endif
|
||||
parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Do not expose the virtual kernel memory layout to userspace.
|
||||
|
||||
@@ -312,7 +312,6 @@ void __init mem_init(void)
|
||||
(mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1;
|
||||
#endif
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
#ifdef CONFIG_PPC32
|
||||
pr_info("Kernel virtual memory layout:\n");
|
||||
#ifdef CONFIG_KASAN
|
||||
|
||||
@@ -102,7 +102,6 @@ void __init mem_init(void)
|
||||
high_memory = (void *)(__va(PFN_PHYS(max_low_pfn)));
|
||||
memblock_free_all();
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
print_vm_layout();
|
||||
}
|
||||
|
||||
|
||||
@@ -209,8 +209,6 @@ void __init mem_init(void)
|
||||
setup_zero_pages(); /* Setup zeroed pages. */
|
||||
|
||||
cmma_init_nodat();
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
}
|
||||
|
||||
void free_initmem(void)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user