1 files changed, 8 insertions, 4 deletions

diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 2d9c448d8c52..3265968cd2cd 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -127,17 +127,21 @@ 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) \
         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))
+                              (unsigned long)offsetof(struct name, field))
 #define VMCOREINFO_LENGTH(name, value) \
         vmcoreinfo_append_str("LENGTH(%s)=%lu\n", #name, (unsigned long)value)
 #define VMCOREINFO_NUMBER(name) \