diff options
Diffstat (limited to 'arch/m68k/mm/motorola.c')
| -rw-r--r-- | arch/m68k/mm/motorola.c | 12 | 
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 251c5437787..b958916e5ea 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -45,7 +45,7 @@ EXPORT_SYMBOL(mm_cachebits);  #endif  /* size of memory already mapped in head.S */ -#define INIT_MAPPED_SIZE	(4UL<<20) +extern __initdata unsigned long m68k_init_mapped_size;  extern unsigned long availmem; @@ -233,7 +233,7 @@ void __init paging_init(void)  			printk("Fix your bootloader or use a memfile to make use of this area!\n");  			m68k_num_memory--;  			memmove(m68k_memory + i, m68k_memory + i + 1, -				(m68k_num_memory - i) * sizeof(struct mem_info)); +				(m68k_num_memory - i) * sizeof(struct m68k_mem_info));  			continue;  		}  		addr = m68k_memory[i].addr + m68k_memory[i].size; @@ -271,10 +271,12 @@ void __init paging_init(void)  	 */  	addr = m68k_memory[0].addr;  	size = m68k_memory[0].size; -	free_bootmem_node(NODE_DATA(0), availmem, min(INIT_MAPPED_SIZE, size) - (availmem - addr)); +	free_bootmem_node(NODE_DATA(0), availmem, +			  min(m68k_init_mapped_size, size) - (availmem - addr));  	map_node(0); -	if (size > INIT_MAPPED_SIZE) -		free_bootmem_node(NODE_DATA(0), addr + INIT_MAPPED_SIZE, size - INIT_MAPPED_SIZE); +	if (size > m68k_init_mapped_size) +		free_bootmem_node(NODE_DATA(0), addr + m68k_init_mapped_size, +				  size - m68k_init_mapped_size);  	for (i = 1; i < m68k_num_memory; i++)  		map_node(i);  | 
