korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 01:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

kcore: register vmalloc area in generic way

Browse Source 
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: KAMEZAWA 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
KAMEZAWA Hiroyuki 2009-09-22 16:45:44 -07:00 committed by Linus Torvalds
parent c30bb2a25f
commit a0614da88b
8 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/mm/init.c
View File

@ -617,7 +617,7 @@ mem_init (void)
long reserved_pages, codesize, datasize, initsize; long reserved_pages, codesize, datasize, initsize;
pg_data_t *pgdat; pg_data_t *pgdat;
int i; 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_PGD * sizeof(pgd_t) != PAGE_SIZE);
BUG_ON(PTRS_PER_PMD * sizeof(pmd_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); high_memory = __va(max_low_pfn * PAGE_SIZE);
kclist_add(&kcore_mem, __va(0), max_low_pfn * PAGE_SIZE, KCORE_RAM); 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); kclist_add(&kcore_kernel, _stext, _end - _stext, KCORE_TEXT);
for_each_online_pgdat(pgdat) for_each_online_pgdat(pgdat)

4
arch/mips/mm/init.c
View File

@ -352,7 +352,7 @@ void __init paging_init(void)
free_area_init_nodes(max_zone_pfns); free_area_init_nodes(max_zone_pfns);
} }
static struct kcore_list kcore_mem, kcore_vmalloc; static struct kcore_list kcore_mem;
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
static struct kcore_list kcore_kseg0; static struct kcore_list kcore_kseg0;
#endif #endif
@ -413,8 +413,6 @@ void __init mem_init(void)
0x80000000 - 4, KCORE_TEXT); 0x80000000 - 4, KCORE_TEXT);
#endif #endif
kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT, KCORE_RAM); 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, " printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
"%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n", "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",

4
arch/powerpc/mm/init_32.c
View File

@ -243,7 +243,6 @@ void free_initrd_mem(unsigned long start, unsigned long end)
#endif #endif
#ifdef CONFIG_PROC_KCORE #ifdef CONFIG_PROC_KCORE
static struct kcore_list kcore_vmem;
static int __init setup_kcore(void) 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_mem, __va(base), size, KCORE_RAM);
} }
kclist_add(&kcore_vmem, (void *)VMALLOC_START,
VMALLOC_END-VMALLOC_START, KCORE_VMALLOC);
return 0; return 0;
} }
module_init(setup_kcore); module_init(setup_kcore);

4
arch/powerpc/mm/init_64.c
View File

@ -110,7 +110,6 @@ void free_initrd_mem(unsigned long start, unsigned long end)
#endif #endif
#ifdef CONFIG_PROC_KCORE #ifdef CONFIG_PROC_KCORE
static struct kcore_list kcore_vmem;
static int __init setup_kcore(void) 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_mem, __va(base), size, KCORE_RAM);
} }
kclist_add(&kcore_vmem, (void *)VMALLOC_START,
VMALLOC_END-VMALLOC_START, KCORE_VMALLOC);
return 0; return 0;
} }
module_init(setup_kcore); module_init(setup_kcore);

4
arch/sh/mm/init.c
View File

@ -186,7 +186,7 @@ void __init paging_init(void)
set_fixmap_nocache(FIX_UNCACHED, __pa(&__uncached_start)); 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) void __init mem_init(void)
{ {
@ -227,8 +227,6 @@ void __init mem_init(void)
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; 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_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, " printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk data, %dk init)\n", "%dk data, %dk init)\n",

4
arch/x86/mm/init_32.c
View File

@ -857,7 +857,7 @@ static void __init test_wp_bit(void)
} }
} }
static struct kcore_list kcore_mem, kcore_vmalloc; static struct kcore_list kcore_mem;
void __init mem_init(void) void __init mem_init(void)
{ {
@ -887,8 +887,6 @@ void __init mem_init(void)
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; 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_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, " printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk reserved, %dk data, %dk init, %ldk highmem)\n", "%dk reserved, %dk data, %dk init, %ldk highmem)\n",

4
arch/x86/mm/init_64.c
View File

@ -647,7 +647,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
#endif /* CONFIG_MEMORY_HOTPLUG */ #endif /* CONFIG_MEMORY_HOTPLUG */
static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, static struct kcore_list kcore_mem, kcore_kernel,
kcore_modules, kcore_vsyscall; kcore_modules, kcore_vsyscall;
void __init mem_init(void) void __init mem_init(void)
@ -678,8 +678,6 @@ void __init mem_init(void)
/* Register memory areas for /proc/kcore */ /* Register memory areas for /proc/kcore */
kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT, KCORE_RAM); 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);
kclist_add(&kcore_kernel, &_stext, _end - _stext, KCORE_TEXT); kclist_add(&kcore_kernel, &_stext, _end - _stext, KCORE_TEXT);
kclist_add(&kcore_modules, (void *)MODULES_VADDR, MODULES_LEN, kclist_add(&kcore_modules, (void *)MODULES_VADDR, MODULES_LEN,
KCORE_OTHER); KCORE_OTHER);

5
fs/proc/kcore.c
View File

@ -372,9 +372,14 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
return acc; return acc;
} }
static struct kcore_list kcore_vmalloc;
static int __init proc_kcore_init(void) static int __init proc_kcore_init(void)
{ {
proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &proc_kcore_operations); proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &proc_kcore_operations);
kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
VMALLOC_END - VMALLOC_START, KCORE_VMALLOC);
return 0; return 0;
} }
module_init(proc_kcore_init); module_init(proc_kcore_init);