parisc: perf: wire up sys_perf_counter_open

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 9038f39d9d736320996f95e6bae5d10473895da0..c38bbc7af793fc2a7c7fb91dd127b579d640bd8f 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -16,6 +16,7 @@ config PARISC
        select RTC_DRV_GENERIC
        select INIT_ALL_POSSIBLE
        select BUG
+       select HAVE_PERF_COUNTERS
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
          in many of their workstations & servers (HP9000 700 and 800 series,

diff --git a/arch/parisc/include/asm/perf_counter.h b/arch/parisc/include/asm/perf_counter.h
new file mode 100644 (file)
index 0000000..dc9e829
--- /dev/null
+++ b/arch/parisc/include/asm/perf_counter.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_PARISC_PERF_COUNTER_H
+#define __ASM_PARISC_PERF_COUNTER_H
+
+/* parisc only supports software counters through this interface. */
+static inline void set_perf_counter_pending(void) { }
+
+#endif /* __ASM_PARISC_PERF_COUNTER_H */

diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 0c83673a03aa6d930bf3c5247faeee0099f5afa5..cf145eb026b34f9049075b2c6bf348ebef2ceb43 100644 (file)
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -416,7 +416,7 @@
        ENTRY_COMP(preadv)              /* 315 */
        ENTRY_COMP(pwritev)
        ENTRY_COMP(rt_tgsigqueueinfo)
-       ENTRY_SAME(ni_syscall)
+       ENTRY_SAME(perf_counter_open)
 
        /* Nothing yet */
 

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index ceb68aa51f7f5eaeaa109a250ac0ceb9ddc68665..188801b4ebc6fe0ab24a78964c1f84785a0584c5 100644 (file)
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -19,6 +19,12 @@
 #define cpu_relax()    asm volatile("" ::: "memory");
 #endif
 
+#ifdef __hppa__
+#include "../../arch/parisc/include/asm/unistd.h"
+#define rmb()          asm volatile("" ::: "memory")
+#define cpu_relax()    asm volatile("" ::: "memory");
+#endif
+
 #include <time.h>
 #include <unistd.h>
 #include <sys/types.h>