From 839a4f639da0c6e47b47e81e2c0220f4ba4c9d78 Mon Sep 17 00:00:00 2001
From: John Williams <john.williams@petalogix.com>
Date: Tue, 24 Nov 2009 20:27:54 +1000
Subject: [PATCH] --- yaml --- r: 176139 b: refs/heads/master c:
 3540ce8238c2d29a2a20a1876575c0064d0da23e h: refs/heads/master i:   176137:
 400e573a1b19218a4a14e02e13bc02c23ed5f9af   176135:
 e8fc597b42d6e370c9ddaafc63457e11b394fbda v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/microblaze/Kconfig                 |  2 ++
 trunk/arch/microblaze/Makefile                |  2 ++
 trunk/arch/microblaze/oprofile/Makefile       | 13 +++++++++++
 .../microblaze/oprofile/microblaze_oprofile.c | 22 +++++++++++++++++++
 5 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/microblaze/oprofile/Makefile
 create mode 100644 trunk/arch/microblaze/oprofile/microblaze_oprofile.c

diff --git a/[refs] b/[refs]
index 79a194fe0c58..6cfba0d0079f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33d9ff5985ff015cbaaef85285d19fe580487cf3
+refs/heads/master: 3540ce8238c2d29a2a20a1876575c0064d0da23e
diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig
index e297802b8321..165cf06b9b0e 100644
--- a/trunk/arch/microblaze/Kconfig
+++ b/trunk/arch/microblaze/Kconfig
@@ -13,6 +13,8 @@ config MICROBLAZE
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select USB_ARCH_HAS_EHCI
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select HAVE_OPROFILE
+	select TRACING_SUPPORT
 
 config SWAP
 	def_bool n
diff --git a/trunk/arch/microblaze/Makefile b/trunk/arch/microblaze/Makefile
index 34187354304a..d2d6cfcb1a30 100644
--- a/trunk/arch/microblaze/Makefile
+++ b/trunk/arch/microblaze/Makefile
@@ -51,6 +51,8 @@ core-y += arch/microblaze/kernel/
 core-y += arch/microblaze/mm/
 core-y += arch/microblaze/platform/
 
+drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/
+
 boot := arch/microblaze/boot
 
 # Are we making a simpleImage.<boardname> target? If so, crack out the boardname
diff --git a/trunk/arch/microblaze/oprofile/Makefile b/trunk/arch/microblaze/oprofile/Makefile
new file mode 100644
index 000000000000..0d0348c8af97
--- /dev/null
+++ b/trunk/arch/microblaze/oprofile/Makefile
@@ -0,0 +1,13 @@
+#
+# arch/microblaze/oprofile/Makefile
+#
+
+obj-$(CONFIG_OPROFILE) += oprofile.o
+
+DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
+		oprof.o cpu_buffer.o buffer_sync.o \
+		event_buffer.o oprofile_files.o \
+		oprofilefs.o oprofile_stats.o \
+		timer_int.o )
+
+oprofile-y := $(DRIVER_OBJS) microblaze_oprofile.o
diff --git a/trunk/arch/microblaze/oprofile/microblaze_oprofile.c b/trunk/arch/microblaze/oprofile/microblaze_oprofile.c
new file mode 100644
index 000000000000..def17e59888e
--- /dev/null
+++ b/trunk/arch/microblaze/oprofile/microblaze_oprofile.c
@@ -0,0 +1,22 @@
+/*
+ * Microblaze oprofile code
+ *
+ * Copyright (C) 2009 Michal Simek <monstr@monstr.eu>
+ * Copyright (C) 2009 PetaLogix
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/oprofile.h>
+#include <linux/init.h>
+
+int __init oprofile_arch_init(struct oprofile_operations *ops)
+{
+	return -1;
+}
+
+void oprofile_arch_exit(void)
+{
+}