From d5ff4aaef70a29bf3e7894257ae0e5609fc0200c Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Thu, 7 Feb 2008 00:15:22 -0800 Subject: [PATCH] --- yaml --- r: 83843 b: refs/heads/master c: bba1f603b88f30945ae4c5eccf2a6f5a12b877c5 h: refs/heads/master i: 83841: a6087761d62c3e0e4978bb61543ad19e2997c56d 83839: 36a26dfa16e5d349d5dc0728e8a42597a7d95f34 v: v3 --- [refs] | 2 +- trunk/include/linux/kexec.h | 4 ++++ trunk/kernel/kexec.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 46fc9e179511..74fcc16956d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e4f2955433231b4b02dc4a9eb5d4d403a8680e1 +refs/heads/master: bba1f603b88f30945ae4c5eccf2a6f5a12b877c5 diff --git a/trunk/include/linux/kexec.h b/trunk/include/linux/kexec.h index cbc3cd7e11c1..3265968cd2cd 100644 --- a/trunk/include/linux/kexec.h +++ b/trunk/include/linux/kexec.h @@ -127,6 +127,10 @@ void vmcoreinfo_append_str(const char *fmt, ...) __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 --git a/trunk/kernel/kexec.c b/trunk/kernel/kexec.c index 8eb4df1cabcc..06a0e2775651 100644 --- a/trunk/kernel/kexec.c +++ b/trunk/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);