From: "Ken'ichi Ohmichi" For readability, all the calls to vmcoreinfo_append_str() are changed to macros having a prefix "VMCOREINFO_". This discussion is the following: http://www.ussg.iu.edu/hypermail/linux/kernel/0709.3/0584.html Signed-off-by: Ken'ichi Ohmichi Acked-by: Simon Horman Cc: David Rientjes Signed-off-by: Andrew Morton --- include/linux/kexec.h | 4 ++++ kernel/kexec.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff -puN include/linux/kexec.h~vmcoreinfo-add-vmcoreinfo_-to-all-the-call-for-vmcoreinfo_append_str include/linux/kexec.h --- a/include/linux/kexec.h~vmcoreinfo-add-vmcoreinfo_-to-all-the-call-for-vmcoreinfo_append_str +++ a/include/linux/kexec.h @@ -127,6 +127,10 @@ void vmcoreinfo_append_str(const char *f __attribute__ ((format (printf, 1, 2))); unsigned long paddr_vmcoreinfo_note(void); +#define VMCOREINFO_OSRELEASE(name) \ + vmcoreinfo_append_str("OSRELEASE=%s\n", #name) +#define VMCOREINFO_PAGESIZE(value) \ + vmcoreinfo_append_str("PAGESIZE=%ld\n", value) #define VMCOREINFO_SYMBOL(name) \ vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name) #define VMCOREINFO_SIZE(name) \ diff -puN kernel/kexec.c~vmcoreinfo-add-vmcoreinfo_-to-all-the-call-for-vmcoreinfo_append_str kernel/kexec.c --- a/kernel/kexec.c~vmcoreinfo-add-vmcoreinfo_-to-all-the-call-for-vmcoreinfo_append_str +++ a/kernel/kexec.c @@ -1361,8 +1361,8 @@ unsigned long __attribute__ ((weak)) pad 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); _