Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8c27ac9 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86, numa, 32-bit: print out debug info on all kvas 



also fix the print out of node_remap_end_vaddr

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 05961523

arch/x86/mm/discontig_32.c

+7 −2
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ static void __init allocate_pgdat(int nid) 
		reserve_early(pgdat_phys, pgdat_phys + sizeof(pg_data_t),

			      "NODE_DATA");

	}

	printk(KERN_DEBUG "allocate_pgdat: node %d NODE_DATA %08lx\n",

		nid, (unsigned long)NODE_DATA(nid));

}



#ifdef CONFIG_DISCONTIGMEM
@@ -208,8 +210,12 @@ void __init remap_numa_kva(void) 
	int node;



	for_each_online_node(node) {

		printk(KERN_DEBUG "remap_numa_kva: node %d\n", node);

		for (pfn=0; pfn < node_remap_size[node]; pfn += PTRS_PER_PTE) {

			vaddr = node_remap_start_vaddr[node]+(pfn<<PAGE_SHIFT);

			printk(KERN_DEBUG "remap_numa_kva: %08lx to pfn %08lx\n",

				(unsigned long)vaddr,

				node_remap_start_pfn[node] + pfn);

			set_pmd_pfn((ulong) vaddr, 

				node_remap_start_pfn[node] + pfn, 

				PAGE_KERNEL_LARGE);
@@ -293,8 +299,7 @@ static void init_remap_allocator(int nid) 


	printk ("node %d will remap to vaddr %08lx - %08lx\n", nid,

		(ulong) node_remap_start_vaddr[nid],

		(ulong) pfn_to_kaddr(highstart_pfn

		   + node_remap_offset[nid] + node_remap_size[nid]));

		(ulong) node_remap_end_vaddr[nid]);

}

#else

void *alloc_remap(int nid, unsigned long size)

mm/page_alloc.c

+5 −0
Original line number Diff line number Diff line
@@ -3486,6 +3486,11 @@ void __paginginit free_area_init_node(int nid, struct pglist_data *pgdat, 
	calculate_node_totalpages(pgdat, zones_size, zholes_size);



	alloc_node_mem_map(pgdat);

#ifdef CONFIG_FLAT_NODE_MEM_MAP

	printk(KERN_DEBUG "free_area_init_node: node %d, pgdat %08lx, node_mem_map %08lx\n",

		nid, (unsigned long)pgdat,

		(unsigned long)pgdat->node_mem_map);

#endif



	free_area_init_core(pgdat, zones_size, zholes_size);

}