perfc_defn.h is used to initialise an array of performance counter structures. However, it is included twice to initialise two arrays (perfcounter in perfc.h and perfc_info in perfc.c). The usual header file guard (#ifndef..., #define..., #endif) prevents these two arrays being initialised with the contents of perfc_defn.h in the same file. This patch fixes this and allows Xenperf to work properly. # HG changeset patch # User rcmcilro@localhost.localdomain # Node ID a1972c8664eaf10f6b63ed239b3fa676d1f73794 # Parent d6a821700752afe9730137a85dea3da579c16c2d Allow perfc_defn.h to be included twice diff -r d6a821700752 -r a1972c8664ea xen/include/xen/perfc_defn.h --- a/xen/include/xen/perfc_defn.h Tue Aug 2 13:37:54 2005 +++ b/xen/include/xen/perfc_defn.h Wed Aug 3 09:42:42 2005 @@ -1,5 +1,3 @@ -#ifndef __XEN_PERFC_DEFN_H__ -#define __XEN_PERFC_DEFN_H__ #define PERFC_MAX_PT_UPDATES 64 #define PERFC_PT_UPDATES_BUCKET_SIZE 3 @@ -124,4 +122,3 @@ PERFCOUNTER_CPU(remove_write_bad_prediction, "remove_write bad prediction") PERFCOUNTER_CPU(update_hl2e_invlpg, "update_hl2e calls invlpg") -#endif /* __XEN_PERFC_DEF _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel