From bcbba6c10ef6b14b0542d7ed7380e95168175818 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Tue, 16 Oct 2007 23:27:30 -0700 Subject: add-vmcore: add a prefix "VMCOREINFO_" to the vmcoreinfo macros Add a prefix "VMCOREINFO_" to the vmcoreinfo macros. Old vmcoreinfo macros were defined as generic names SYMBOL/SIZE/OFFSET /LENGTH/CONFIG, and it is impossible to grep for them. So these names should be changed. This discussion is the following: http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/0415.html Signed-off-by: Ken'ichi Ohmichi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ia64/kernel/machine_kexec.c | 20 ++++++++++---------- arch/x86/kernel/machine_kexec_32.c | 6 +++--- arch/x86/kernel/machine_kexec_64.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'arch') diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c index c55a0909b90..0dd3b2394cd 100644 --- a/arch/ia64/kernel/machine_kexec.c +++ b/arch/ia64/kernel/machine_kexec.c @@ -128,19 +128,19 @@ void machine_kexec(struct kimage *image) void arch_crash_save_vmcoreinfo(void) { #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE - SYMBOL(pgdat_list); - LENGTH(pgdat_list, MAX_NUMNODES); - - SYMBOL(node_memblk); - LENGTH(node_memblk, NR_NODE_MEMBLKS); - SIZE(node_memblk_s); - OFFSET(node_memblk_s, start_paddr); - OFFSET(node_memblk_s, size); + VMCOREINFO_SYMBOL(pgdat_list); + VMCOREINFO_LENGTH(pgdat_list, MAX_NUMNODES); + + VMCOREINFO_SYMBOL(node_memblk); + VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS); + VMCOREINFO_SIZE(node_memblk_s); + VMCOREINFO_OFFSET(node_memblk_s, start_paddr); + VMCOREINFO_OFFSET(node_memblk_s, size); #endif #ifdef CONFIG_PGTABLE_3 - CONFIG(PGTABLE_3); + VMCOREINFO_CONFIG(PGTABLE_3); #elif CONFIG_PGTABLE_4 - CONFIG(PGTABLE_4); + VMCOREINFO_CONFIG(PGTABLE_4); #endif } diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index ae20fa5afa6..8459ca64bc2 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c @@ -174,11 +174,11 @@ early_param("crashkernel", parse_crashkernel); void arch_crash_save_vmcoreinfo(void) { #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE - SYMBOL(node_data); - LENGTH(node_data, MAX_NUMNODES); + VMCOREINFO_SYMBOL(node_data); + VMCOREINFO_LENGTH(node_data, MAX_NUMNODES); #endif #ifdef CONFIG_X86_PAE - CONFIG(X86_PAE); + VMCOREINFO_CONFIG(X86_PAE); #endif } diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index e333ea110a5..7450b69710b 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -261,8 +261,8 @@ early_param("crashkernel", setup_crashkernel); void arch_crash_save_vmcoreinfo(void) { #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE - SYMBOL(node_data); - LENGTH(node_data, MAX_NUMNODES); + VMCOREINFO_SYMBOL(node_data); + VMCOREINFO_LENGTH(node_data, MAX_NUMNODES); #endif } -- cgit v1.2.3