1.1 --- a/xen/include/public/kexec.h	Wed Nov 19 12:52:03 2008 +0000
     1.2 +++ b/xen/include/public/kexec.h	Wed Nov 19 13:13:39 2008 +0000
     1.3 @@ -155,27 +155,6 @@ typedef struct xen_kexec_range {
     1.4      unsigned long start;
     1.5  } xen_kexec_range_t;
     1.6  
     1.7 -/* vmcoreinfo stuff */
     1.8 -#define VMCOREINFO_BYTES           (4096)
     1.9 -#define VMCOREINFO_NOTE_NAME       "VMCOREINFO_XEN"
    1.10 -void arch_crash_save_vmcoreinfo(void);
    1.11 -void vmcoreinfo_append_str(const char *fmt, ...)
    1.12 -       __attribute__ ((format (printf, 1, 2)));
    1.13 -#define VMCOREINFO_PAGESIZE(value) \
    1.14 -       vmcoreinfo_append_str("PAGESIZE=%ld\n", value)
    1.15 -#define VMCOREINFO_SYMBOL(name) \
    1.16 -       vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)
    1.17 -#define VMCOREINFO_SYMBOL_ALIAS(alias, name) \
    1.18 -       vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #alias, (unsigned long)&name)
    1.19 -#define VMCOREINFO_STRUCT_SIZE(name) \
    1.20 -       vmcoreinfo_append_str("SIZE(%s)=%zu\n", #name, sizeof(struct name))
    1.21 -#define VMCOREINFO_OFFSET(name, field) \
    1.22 -       vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \
    1.23 -                             (unsigned long)offsetof(struct name, field))
    1.24 -#define VMCOREINFO_OFFSET_ALIAS(name, field, alias) \
    1.25 -       vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #alias, \
    1.26 -                             (unsigned long)offsetof(struct name, field))
    1.27 -
    1.28  #endif /* _XEN_PUBLIC_KEXEC_H */
    1.29  
    1.30  /*

     2.1 --- a/xen/include/xen/kexec.h	Wed Nov 19 12:52:03 2008 +0000
     2.2 +++ b/xen/include/xen/kexec.h	Wed Nov 19 13:13:39 2008 +0000
     2.3 @@ -33,6 +33,27 @@ crash_xen_info_t *kexec_crash_save_info(
     2.4  void machine_crash_shutdown(void);
     2.5  int machine_kexec_get(xen_kexec_range_t *range);
     2.6  
     2.7 +/* vmcoreinfo stuff */
     2.8 +#define VMCOREINFO_BYTES           (4096)
     2.9 +#define VMCOREINFO_NOTE_NAME       "VMCOREINFO_XEN"
    2.10 +void arch_crash_save_vmcoreinfo(void);
    2.11 +void vmcoreinfo_append_str(const char *fmt, ...)
    2.12 +       __attribute__ ((format (printf, 1, 2)));
    2.13 +#define VMCOREINFO_PAGESIZE(value) \
    2.14 +       vmcoreinfo_append_str("PAGESIZE=%ld\n", value)
    2.15 +#define VMCOREINFO_SYMBOL(name) \
    2.16 +       vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)
    2.17 +#define VMCOREINFO_SYMBOL_ALIAS(alias, name) \
    2.18 +       vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #alias, (unsigned long)&name)
    2.19 +#define VMCOREINFO_STRUCT_SIZE(name) \
    2.20 +       vmcoreinfo_append_str("SIZE(%s)=%zu\n", #name, sizeof(struct name))
    2.21 +#define VMCOREINFO_OFFSET(name, field) \
    2.22 +       vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \
    2.23 +                             (unsigned long)offsetof(struct name, field))
    2.24 +#define VMCOREINFO_OFFSET_ALIAS(name, field, alias) \
    2.25 +       vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #alias, \
    2.26 +                             (unsigned long)offsetof(struct name, field))
    2.27 +
    2.28  #endif /* __XEN_KEXEC_H__ */
    2.29  
    2.30  /*