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

Commit a0614da8 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

kcore: register vmalloc area in generic way 



For /proc/kcore, vmalloc areas are registered per arch.  But, all of them
registers same range of [VMALLOC_START...VMALLOC_END) This patch unifies
them.  By this.  archs which have no kclist_add() hooks can see vmalloc
area correctly.

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c30bb2a2

arch/ia64/mm/init.c

+1 −3
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ mem_init (void) 
	long reserved_pages, codesize, datasize, initsize;

	pg_data_t *pgdat;

	int i;

	static struct kcore_list kcore_mem, kcore_vmem, kcore_kernel;

	static struct kcore_list kcore_mem, kcore_kernel;



	BUG_ON(PTRS_PER_PGD * sizeof(pgd_t) != PAGE_SIZE);

	BUG_ON(PTRS_PER_PMD * sizeof(pmd_t) != PAGE_SIZE);
@@ -640,8 +640,6 @@ mem_init (void) 
	high_memory = __va(max_low_pfn * PAGE_SIZE);



	kclist_add(&kcore_mem, __va(0), max_low_pfn * PAGE_SIZE, KCORE_RAM);

	kclist_add(&kcore_vmem, (void *)VMALLOC_START,

			VMALLOC_END-VMALLOC_START, KCORE_VMALLOC);

	kclist_add(&kcore_kernel, _stext, _end - _stext, KCORE_TEXT);



	for_each_online_pgdat(pgdat)

arch/mips/mm/init.c

+1 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ void __init paging_init(void) 
	free_area_init_nodes(max_zone_pfns);

}



static struct kcore_list kcore_mem, kcore_vmalloc;

static struct kcore_list kcore_mem;

#ifdef CONFIG_64BIT

static struct kcore_list kcore_kseg0;

#endif
@@ -413,8 +413,6 @@ void __init mem_init(void) 
				0x80000000 - 4, KCORE_TEXT);

#endif

	kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT, KCORE_RAM);

	kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,

		   VMALLOC_END-VMALLOC_START, KCORE_VMALLOC);



	printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "

	       "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",

arch/powerpc/mm/init_32.c

+0 −4
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
#endif



#ifdef CONFIG_PROC_KCORE

static struct kcore_list kcore_vmem;



static int __init setup_kcore(void)

{
@@ -271,9 +270,6 @@ static int __init setup_kcore(void) 
		kclist_add(kcore_mem, __va(base), size, KCORE_RAM);

	}



	kclist_add(&kcore_vmem, (void *)VMALLOC_START,

		VMALLOC_END-VMALLOC_START, KCORE_VMALLOC);



	return 0;

}

module_init(setup_kcore);

arch/powerpc/mm/init_64.c

+0 −4
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
#endif



#ifdef CONFIG_PROC_KCORE

static struct kcore_list kcore_vmem;



static int __init setup_kcore(void)

{
@@ -131,9 +130,6 @@ static int __init setup_kcore(void) 
		kclist_add(kcore_mem, __va(base), size, KCORE_RAM);

	}



	kclist_add(&kcore_vmem, (void *)VMALLOC_START,

		VMALLOC_END-VMALLOC_START, KCORE_VMALLOC);



	return 0;

}

module_init(setup_kcore);

arch/sh/mm/init.c

+1 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ void __init paging_init(void) 
	set_fixmap_nocache(FIX_UNCACHED, __pa(&__uncached_start));

}



static struct kcore_list kcore_mem, kcore_vmalloc;

static struct kcore_list kcore_mem;



void __init mem_init(void)

{
@@ -227,8 +227,6 @@ void __init mem_init(void) 
	initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;



	kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT, KCORE_RAM);

	kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,

		   VMALLOC_END - VMALLOC_START, KCORE_VMALLOC);



	printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "

	       "%dk data, %dk init)\n",