[PATCH 3/8][mmotm] kcore register vmalloc area in generic way
From: KAMEZAWA Hiroyuki
Date: Mon Aug 31 2009 - 06:06:23 EST
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
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.
Changelog:
- fixed unexpected change which breaks bisection.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/ia64/mm/init.c | 4 +---
arch/mips/mm/init.c | 4 +---
arch/powerpc/mm/init_32.c | 4 ----
arch/powerpc/mm/init_64.c | 4 ----
arch/sh/mm/init.c | 4 +---
arch/x86/mm/init_32.c | 4 +---
arch/x86/mm/init_64.c | 4 +---
fs/proc/kcore.c | 5 +++++
8 files changed, 10 insertions(+), 23 deletions(-)
Index: mmotm-2.6.31-Aug27/arch/ia64/mm/init.c
===================================================================
--- mmotm-2.6.31-Aug27.orig/arch/ia64/mm/init.c
+++ mmotm-2.6.31-Aug27/arch/ia64/mm/init.c
@@ -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)
Index: mmotm-2.6.31-Aug27/arch/mips/mm/init.c
===================================================================
--- mmotm-2.6.31-Aug27.orig/arch/mips/mm/init.c
+++ mmotm-2.6.31-Aug27/arch/mips/mm/init.c
@@ -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",
Index: mmotm-2.6.31-Aug27/arch/powerpc/mm/init_32.c
===================================================================
--- mmotm-2.6.31-Aug27.orig/arch/powerpc/mm/init_32.c
+++ mmotm-2.6.31-Aug27/arch/powerpc/mm/init_32.c
@@ -243,7 +243,6 @@ void free_initrd_mem(unsigned long start
#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);
Index: mmotm-2.6.31-Aug27/arch/powerpc/mm/init_64.c
===================================================================
--- mmotm-2.6.31-Aug27.orig/arch/powerpc/mm/init_64.c
+++ mmotm-2.6.31-Aug27/arch/powerpc/mm/init_64.c
@@ -110,7 +110,6 @@ void free_initrd_mem(unsigned long start
#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);
Index: mmotm-2.6.31-Aug27/arch/sh/mm/init.c
===================================================================
--- mmotm-2.6.31-Aug27.orig/arch/sh/mm/init.c
+++ mmotm-2.6.31-Aug27/arch/sh/mm/init.c
@@ -181,7 +181,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)
{
@@ -219,8 +219,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",
Index: mmotm-2.6.31-Aug27/arch/x86/mm/init_32.c
===================================================================
--- mmotm-2.6.31-Aug27.orig/arch/x86/mm/init_32.c
+++ mmotm-2.6.31-Aug27/arch/x86/mm/init_32.c
@@ -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)
{
@@ -887,8 +887,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 reserved, %dk data, %dk init, %ldk highmem)\n",
Index: mmotm-2.6.31-Aug27/arch/x86/mm/init_64.c
===================================================================
--- mmotm-2.6.31-Aug27.orig/arch/x86/mm/init_64.c
+++ mmotm-2.6.31-Aug27/arch/x86/mm/init_64.c
@@ -647,7 +647,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to
#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;
void __init mem_init(void)
@@ -678,8 +678,6 @@ void __init mem_init(void)
/* Register memory areas for /proc/kcore */
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_modules, (void *)MODULES_VADDR, MODULES_LEN,
KCORE_OTHER);
Index: mmotm-2.6.31-Aug27/fs/proc/kcore.c
===================================================================
--- mmotm-2.6.31-Aug27.orig/fs/proc/kcore.c
+++ mmotm-2.6.31-Aug27/fs/proc/kcore.c
@@ -372,9 +372,14 @@ read_kcore(struct file *file, char __use
return acc;
}
+static struct kcore_list kcore_vmalloc;
+
static int __init proc_kcore_init(void)
{
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;
}
module_init(proc_kcore_init);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/