2.6.24-git18

 kernel

diff --git a/kernel/kexec.c b/kernel/kexec.c
index 9a26eec..06a0e27 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1361,8 +1361,8 @@ unsigned long __attribute__ ((weak)) paddr_vmcoreinfo_note(void)
 
 static int __init crash_save_vmcoreinfo_init(void)
 {
-   vmcoreinfo_append_str("OSRELEASE=%s\n", init_uts_ns.name.release);
-   vmcoreinfo_append_str("PAGESIZE=%ld\n", PAGE_SIZE);
+   VMCOREINFO_OSRELEASE(init_uts_ns.name.release);
+   VMCOREINFO_PAGESIZE(PAGE_SIZE);
 
    VMCOREINFO_SYMBOL(init_uts_ns);
    VMCOREINFO_SYMBOL(node_online_map);
@@ -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);