xen/perfc: Drop arch_perfc_{gather,reset}()

These were only ever used by the IA64 port, which was droped in commit
570c311ca2c7 ("remove ia64").

Remove them, and clean up the arm/x86 stub headers.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/arm/include/asm/perfc.h b/xen/arch/arm/include/asm/perfc.h
deleted file mode 100644 (file)
index 95c4b2b..0000000
--- a/xen/arch/arm/include/asm/perfc.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __ASM_PERFC_H__
-#define __ASM_PERFC_H__
-
-static inline void arch_perfc_reset(void)
-{
-}
-
-static inline void arch_perfc_gather(void)
-{
-}
-
-#endif
-
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- */

diff --git a/xen/arch/x86/include/asm/perfc.h b/xen/arch/x86/include/asm/perfc.h
deleted file mode 100644 (file)
index a1a591e..0000000
--- a/xen/arch/x86/include/asm/perfc.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ASM_PERFC_H__
-#define __ASM_PERFC_H__
-
-static inline void arch_perfc_reset(void)
-{
-}
-
-static inline void arch_perfc_gather(void)
-{
-}
-
-#endif

diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index 80480aa7766d166f08117f186dee14f453d04008..ed4dba36f1bccf9d708aff6868128b7329a818a6 100644 (file)
--- a/xen/common/perfc.c
+++ b/xen/common/perfc.c
@@ -8,7 +8,6 @@
 #include <xen/mm.h>
 #include <xen/guest_access.h>
 #include <public/sysctl.h>
-#include <asm/perfc.h>
 
 #define PERFCOUNTER( var, name )              { name, TYPE_SINGLE, 0 },
 #define PERFCOUNTER_ARRAY( var, name, size )  { name, TYPE_ARRAY,  size },
@@ -148,8 +147,6 @@ void cf_check perfc_reset(unsigned char key)
             break;
         }
     }
-
-    arch_perfc_reset();
 }
 
 static struct xen_sysctl_perfc_desc perfc_d[NR_PERFCTRS];
@@ -199,9 +196,6 @@ static int perfc_copy_info(XEN_GUEST_HANDLE_64(xen_sysctl_perfc_desc_t) desc,
     if ( perfc_vals == NULL )
         return -ENOMEM;
 
-    /* Architecture may fill counters from hardware.  */
-    arch_perfc_gather();
-
     /* We gather the counts together every time. */
     for ( i = j = v = 0; i < NR_PERFCTRS; i++ )
     {