Gitweb: http://git.kernel.org/linus/2d4618dce6a318ff4ec78dfe492cc3793015d540
Commit: 2d4618dce6a318ff4ec78dfe492cc3793015d540
Parent: abf1e11a0dcf5514139cb76ed8eb050107653abd
Author: Kyle McMartin <kyle@mcmartin.ca>
AuthorDate: Tue Jun 23 21:38:49 2009 -0400
Committer: Kyle McMartin <kyle@mcmartin.ca>
CommitDate: Fri Jul 3 03:34:12 2009 +0000
parisc: perf: wire up sys_perf_counter_open
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
---
arch/parisc/Kconfig | 1 +
arch/parisc/include/asm/perf_counter.h | 7 +++++++
arch/parisc/kernel/syscall_table.S | 2 +-
tools/perf/perf.h | 6 ++++++
4 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 9038f39..c38bbc7 100644
--- 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
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 0c83673..cf145eb 100644
--- 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 ceb68aa..188801b 100644
--- 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>
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
