diff options
author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2009-09-22 19:45:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:41 -0400 |
commit | a0614da88b67ffa3dbcc0d40b817e682c7c4a0ee (patch) | |
tree | ae4ca3a8553592af41f7c2cc1a64912d934f6baf /arch/x86 | |
parent | c30bb2a25fcfde6157e6154a32c14686fb0bedbe (diff) |
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: 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>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/mm/init_32.c | 4 | ||||
-rw-r--r-- | arch/x86/mm/init_64.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 2cbc40112932..7108678ca9bc 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -857,7 +857,7 @@ static void __init test_wp_bit(void) | |||
857 | } | 857 | } |
858 | } | 858 | } |
859 | 859 | ||
860 | static struct kcore_list kcore_mem, kcore_vmalloc; | 860 | static struct kcore_list kcore_mem; |
861 | 861 | ||
862 | void __init mem_init(void) | 862 | void __init mem_init(void) |
863 | { | 863 | { |
@@ -887,8 +887,6 @@ void __init mem_init(void) | |||
887 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; | 887 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; |
888 | 888 | ||
889 | kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT, KCORE_RAM); | 889 | kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT, KCORE_RAM); |
890 | kclist_add(&kcore_vmalloc, (void *)VMALLOC_START, | ||
891 | VMALLOC_END-VMALLOC_START, KCORE_VMALLOC); | ||
892 | 890 | ||
893 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " | 891 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " |
894 | "%dk reserved, %dk data, %dk init, %ldk highmem)\n", | 892 | "%dk reserved, %dk data, %dk init, %ldk highmem)\n", |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index c05810b614fe..da2cae7427a6 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -647,7 +647,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | |||
647 | 647 | ||
648 | #endif /* CONFIG_MEMORY_HOTPLUG */ | 648 | #endif /* CONFIG_MEMORY_HOTPLUG */ |
649 | 649 | ||
650 | static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, | 650 | static struct kcore_list kcore_mem, kcore_kernel, |
651 | kcore_modules, kcore_vsyscall; | 651 | kcore_modules, kcore_vsyscall; |
652 | 652 | ||
653 | void __init mem_init(void) | 653 | void __init mem_init(void) |
@@ -678,8 +678,6 @@ void __init mem_init(void) | |||
678 | 678 | ||
679 | /* Register memory areas for /proc/kcore */ | 679 | /* Register memory areas for /proc/kcore */ |
680 | kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT, KCORE_RAM); | 680 | kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT, KCORE_RAM); |
681 | kclist_add(&kcore_vmalloc, (void *)VMALLOC_START, | ||
682 | VMALLOC_END-VMALLOC_START, KCORE_VMALLOC); | ||
683 | kclist_add(&kcore_kernel, &_stext, _end - _stext, KCORE_TEXT); | 681 | kclist_add(&kcore_kernel, &_stext, _end - _stext, KCORE_TEXT); |
684 | kclist_add(&kcore_modules, (void *)MODULES_VADDR, MODULES_LEN, | 682 | kclist_add(&kcore_modules, (void *)MODULES_VADDR, MODULES_LEN, |
685 | KCORE_OTHER); | 683 | KCORE_OTHER); |