diff options
-rw-r--r-- | arch/ia64/kernel/machine_kexec.c | 2 | ||||
-rw-r--r-- | include/linux/kexec.h | 6 | ||||
-rw-r--r-- | kernel/kexec.c | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c index d6cd45f4c6c7..6e725eff271b 100644 --- a/arch/ia64/kernel/machine_kexec.c +++ b/arch/ia64/kernel/machine_kexec.c | |||
@@ -135,7 +135,7 @@ void arch_crash_save_vmcoreinfo(void) | |||
135 | 135 | ||
136 | VMCOREINFO_SYMBOL(node_memblk); | 136 | VMCOREINFO_SYMBOL(node_memblk); |
137 | VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS); | 137 | VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS); |
138 | VMCOREINFO_SIZE(node_memblk_s); | 138 | VMCOREINFO_STRUCT_SIZE(node_memblk_s); |
139 | VMCOREINFO_OFFSET(node_memblk_s, start_paddr); | 139 | VMCOREINFO_OFFSET(node_memblk_s, start_paddr); |
140 | VMCOREINFO_OFFSET(node_memblk_s, size); | 140 | VMCOREINFO_OFFSET(node_memblk_s, size); |
141 | #endif | 141 | #endif |
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 2d9c448d8c52..39112a0e4693 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h | |||
@@ -131,10 +131,10 @@ unsigned long paddr_vmcoreinfo_note(void); | |||
131 | vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name) | 131 | vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name) |
132 | #define VMCOREINFO_SIZE(name) \ | 132 | #define VMCOREINFO_SIZE(name) \ |
133 | vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ | 133 | vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ |
134 | (unsigned long)sizeof(struct name)) | ||
135 | #define VMCOREINFO_TYPEDEF_SIZE(name) \ | ||
136 | vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ | ||
137 | (unsigned long)sizeof(name)) | 134 | (unsigned long)sizeof(name)) |
135 | #define VMCOREINFO_STRUCT_SIZE(name) \ | ||
136 | vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ | ||
137 | (unsigned long)sizeof(struct name)) | ||
138 | #define VMCOREINFO_OFFSET(name, field) \ | 138 | #define VMCOREINFO_OFFSET(name, field) \ |
139 | vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ | 139 | vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ |
140 | (unsigned long)&(((struct name *)0)->field)) | 140 | (unsigned long)&(((struct name *)0)->field)) |
diff --git a/kernel/kexec.c b/kernel/kexec.c index 9a26eec9eb04..8eb4df1cabcc 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -1376,15 +1376,15 @@ static int __init crash_save_vmcoreinfo_init(void) | |||
1376 | #ifdef CONFIG_SPARSEMEM | 1376 | #ifdef CONFIG_SPARSEMEM |
1377 | VMCOREINFO_SYMBOL(mem_section); | 1377 | VMCOREINFO_SYMBOL(mem_section); |
1378 | VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); | 1378 | VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); |
1379 | VMCOREINFO_SIZE(mem_section); | 1379 | VMCOREINFO_STRUCT_SIZE(mem_section); |
1380 | VMCOREINFO_OFFSET(mem_section, section_mem_map); | 1380 | VMCOREINFO_OFFSET(mem_section, section_mem_map); |
1381 | #endif | 1381 | #endif |
1382 | VMCOREINFO_SIZE(page); | 1382 | VMCOREINFO_STRUCT_SIZE(page); |
1383 | VMCOREINFO_SIZE(pglist_data); | 1383 | VMCOREINFO_STRUCT_SIZE(pglist_data); |
1384 | VMCOREINFO_SIZE(zone); | 1384 | VMCOREINFO_STRUCT_SIZE(zone); |
1385 | VMCOREINFO_SIZE(free_area); | 1385 | VMCOREINFO_STRUCT_SIZE(free_area); |
1386 | VMCOREINFO_SIZE(list_head); | 1386 | VMCOREINFO_STRUCT_SIZE(list_head); |
1387 | VMCOREINFO_TYPEDEF_SIZE(nodemask_t); | 1387 | VMCOREINFO_SIZE(nodemask_t); |
1388 | VMCOREINFO_OFFSET(page, flags); | 1388 | VMCOREINFO_OFFSET(page, flags); |
1389 | VMCOREINFO_OFFSET(page, _count); | 1389 | VMCOREINFO_OFFSET(page, _count); |
1390 | VMCOREINFO_OFFSET(page, mapping); | 1390 | VMCOREINFO_OFFSET(page, mapping); |