Commit c76f860c authored by Ken'ichi Ohmichi's avatar Ken'ichi Ohmichi Committed by Linus Torvalds
Browse files

vmcoreinfo: rename vmcoreinfo's macros returning the size 

This patchset is for the vmcoreinfo data.

The vmcoreinfo data has the minimum debugging information only for dump
filtering.  makedumpfile (dump filtering command) gets it to distinguish
unnecessary pages, and makedumpfile creates a small dumpfile.

This patch:

VMCOREINFO_SIZE() should be renamed VMCOREINFO_STRUCT_SIZE() since it's always
returning the size of the struct with a given name. This change would allow
VMCOREINFO_TYPEDEF_SIZE() to simply become VMCOREINFO_SIZE() since it need not
be used exclusively for typedefs.

This discussion is the following:
http://www.ussg.iu.edu/hypermail/linux/kernel/0709.3/0582.html



Signed-off-by: default avatarKen'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 18a01a3b

arch/ia64/kernel/machine_kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void arch_crash_save_vmcoreinfo(void) 


	VMCOREINFO_SYMBOL(node_memblk);

	VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS);

	VMCOREINFO_SIZE(node_memblk_s);

	VMCOREINFO_STRUCT_SIZE(node_memblk_s);

	VMCOREINFO_OFFSET(node_memblk_s, start_paddr);

	VMCOREINFO_OFFSET(node_memblk_s, size);

#endif

include/linux/kexec.h

+3 −3
Original line number Diff line number Diff line
@@ -130,11 +130,11 @@ unsigned long paddr_vmcoreinfo_note(void); 
#define VMCOREINFO_SYMBOL(name) \

	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)

#define VMCOREINFO_SIZE(name) \

	vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \

			      (unsigned long)sizeof(struct name))

#define VMCOREINFO_TYPEDEF_SIZE(name) \

	vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \

			      (unsigned long)sizeof(name))

#define VMCOREINFO_STRUCT_SIZE(name) \

	vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \

			      (unsigned long)sizeof(struct name))

#define VMCOREINFO_OFFSET(name, field) \

	vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \

			      (unsigned long)&(((struct name *)0)->field))

kernel/kexec.c

+7 −7
Original line number Diff line number Diff line
@@ -1376,15 +1376,15 @@ static int __init crash_save_vmcoreinfo_init(void) 
#ifdef CONFIG_SPARSEMEM

	VMCOREINFO_SYMBOL(mem_section);

	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);

	VMCOREINFO_SIZE(mem_section);

	VMCOREINFO_STRUCT_SIZE(mem_section);

	VMCOREINFO_OFFSET(mem_section, section_mem_map);

#endif

	VMCOREINFO_SIZE(page);

	VMCOREINFO_SIZE(pglist_data);

	VMCOREINFO_SIZE(zone);

	VMCOREINFO_SIZE(free_area);

	VMCOREINFO_SIZE(list_head);

	VMCOREINFO_TYPEDEF_SIZE(nodemask_t);

	VMCOREINFO_STRUCT_SIZE(page);

	VMCOREINFO_STRUCT_SIZE(pglist_data);

	VMCOREINFO_STRUCT_SIZE(zone);

	VMCOREINFO_STRUCT_SIZE(free_area);

	VMCOREINFO_STRUCT_SIZE(list_head);

	VMCOREINFO_SIZE(nodemask_t);

	VMCOREINFO_OFFSET(page, flags);

	VMCOREINFO_OFFSET(page, _count);

	VMCOREINFO_OFFSET(page, mapping);

CRA Git | Maintained and supported by SUSTech CRA and CCSE