Commit 3e548a9e authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds

mm/m68k: fix build warning of unused variable

Fix build warning of unused variable:

  arch/m68k/mm/init.c: In function 'mem_init': arch/m68k/mm/init.c:151:6: warning: unused variable 'i' [-Wunused-variable]
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2fb1cd5a
...@@ -146,14 +146,11 @@ void __init print_memmap(void) ...@@ -146,14 +146,11 @@ void __init print_memmap(void)
MLK_ROUNDUP(__bss_start, __bss_stop)); MLK_ROUNDUP(__bss_start, __bss_stop));
} }
void __init mem_init(void) static inline void init_pointer_tables(void)
{ {
#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
int i; int i;
/* this will put all memory onto the freelists */
free_all_bootmem();
#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
/* insert pointer tables allocated so far into the tablelist */ /* insert pointer tables allocated so far into the tablelist */
init_pointer_table((unsigned long)kernel_pg_dir); init_pointer_table((unsigned long)kernel_pg_dir);
for (i = 0; i < PTRS_PER_PGD; i++) { for (i = 0; i < PTRS_PER_PGD; i++) {
...@@ -165,7 +162,13 @@ void __init mem_init(void) ...@@ -165,7 +162,13 @@ void __init mem_init(void)
if (zero_pgtable) if (zero_pgtable)
init_pointer_table((unsigned long)zero_pgtable); init_pointer_table((unsigned long)zero_pgtable);
#endif #endif
}
void __init mem_init(void)
{
/* this will put all memory onto the freelists */
free_all_bootmem();
init_pointer_tables();
mem_init_print_info(NULL); mem_init_print_info(NULL);
print_memmap(); print_memmap();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment