From df8cc6febb85997f0a6ee4a5b3486f0077f1b613 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Fri, 9 Jan 2009 17:01:53 +1100
Subject: [PATCH] --- yaml --- r: 147190 b: refs/heads/master c:
 d662ed26734473d4cb5f3d78cebfec8f9126e97c h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/powerpc/include/asm/perf_counter.h | 10 ++++++++++
 trunk/arch/powerpc/include/asm/systbl.h       |  1 +
 trunk/arch/powerpc/include/asm/unistd.h       |  3 ++-
 trunk/arch/powerpc/platforms/Kconfig.cputype  |  1 +
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/powerpc/include/asm/perf_counter.h

diff --git a/[refs] b/[refs]
index 4d8297acec00..57c2a26bce21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eb96fcfe07b7f2a05577e57533840f8e26bea53
+refs/heads/master: d662ed26734473d4cb5f3d78cebfec8f9126e97c
diff --git a/trunk/arch/powerpc/include/asm/perf_counter.h b/trunk/arch/powerpc/include/asm/perf_counter.h
new file mode 100644
index 000000000000..59530ae1d53c
--- /dev/null
+++ b/trunk/arch/powerpc/include/asm/perf_counter.h
@@ -0,0 +1,10 @@
+/*
+ * Performance counter support - PowerPC-specific definitions.
+ *
+ * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
diff --git a/trunk/arch/powerpc/include/asm/systbl.h b/trunk/arch/powerpc/include/asm/systbl.h
index 803def236654..da300c4d2888 100644
--- a/trunk/arch/powerpc/include/asm/systbl.h
+++ b/trunk/arch/powerpc/include/asm/systbl.h
@@ -322,3 +322,4 @@ SYSCALL_SPU(epoll_create1)
 SYSCALL_SPU(dup3)
 SYSCALL_SPU(pipe2)
 SYSCALL(inotify_init1)
+SYSCALL(perf_counter_open)
diff --git a/trunk/arch/powerpc/include/asm/unistd.h b/trunk/arch/powerpc/include/asm/unistd.h
index e07d0c76ed77..7cef5afe89d8 100644
--- a/trunk/arch/powerpc/include/asm/unistd.h
+++ b/trunk/arch/powerpc/include/asm/unistd.h
@@ -341,10 +341,11 @@
 #define __NR_dup3		316
 #define __NR_pipe2		317
 #define __NR_inotify_init1	318
+#define __NR_perf_counter_open	319
 
 #ifdef __KERNEL__
 
-#define __NR_syscalls		319
+#define __NR_syscalls		320
 
 #define __NR__exit __NR_exit
 #define NR_syscalls	__NR_syscalls
diff --git a/trunk/arch/powerpc/platforms/Kconfig.cputype b/trunk/arch/powerpc/platforms/Kconfig.cputype
index 3d0c776f888d..94dd1fb9a004 100644
--- a/trunk/arch/powerpc/platforms/Kconfig.cputype
+++ b/trunk/arch/powerpc/platforms/Kconfig.cputype
@@ -1,6 +1,7 @@
 config PPC64
 	bool "64-bit kernel"
 	default n
+	select HAVE_PERF_COUNTERS
 	help
 	  This option selects whether a 32-bit or a 64-bit kernel
 	  will be built.