From 6e20da741b77f3e5c9b8a96e3101fcc4ab9cfee2 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Wed, 21 Jan 2009 07:09:41 +0000
Subject: [PATCH] Remove reference to query_modules in oprofile, does not exist
 in linux-2.6. oprofile now builds for ARM

---
 ...9.4-001-avr32-enable-lookup_dcookie.patch} |  0
 .../oprofile-0.9.4-002-no-query-modules.patch | 21 +++++++++++++++++++
 package/oprofile/oprofile.mk                  | 10 +++++----
 3 files changed, 27 insertions(+), 4 deletions(-)
 rename package/oprofile/{oprofile-0.9.4-avr32-enable-lookup_dcookie.patch => oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch} (100%)
 create mode 100644 package/oprofile/oprofile-0.9.4-002-no-query-modules.patch

diff --git a/package/oprofile/oprofile-0.9.4-avr32-enable-lookup_dcookie.patch b/package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch
similarity index 100%
rename from package/oprofile/oprofile-0.9.4-avr32-enable-lookup_dcookie.patch
rename to package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch
diff --git a/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch b/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch
new file mode 100644
index 0000000000..9f00da6419
--- /dev/null
+++ b/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch
@@ -0,0 +1,21 @@
+diff -urN oprofile-0.9.4-0rig//daemon/liblegacy/opd_kernel.c oprofile-0.9.4/daemon/liblegacy/opd_kernel.c
+--- oprofile-0.9.4-0rig//daemon/liblegacy/opd_kernel.c	2005-05-04 04:47:03.000000000 +0200
++++ oprofile-0.9.4/daemon/liblegacy/opd_kernel.c	2009-01-21 07:40:20.000000000 +0100
+@@ -270,6 +270,9 @@
+  */
+ static void opd_drop_module_sample(unsigned long eip)
+ {
++	verbprintf(vmodule, "query_module not available on linux-2.6: %s\n", strerror(EPERM));
++
++#if	0
+ 	char * module_names;
+ 	char * name;
+ 	size_t size = 1024;
+@@ -307,6 +310,7 @@
+ 
+ 	if (module_names)
+ 		free(module_names);
++#endif
+ }
+ 
+ 
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 066dbd2e7b..ee6be3dc1c 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -4,10 +4,11 @@
 #
 #############################################################
 OPROFILE_VERSION := 0.9.4
-OPROFILE_CONF_OPT := --localstatedir=/var \
-		     --with-extra-includes="$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd -I$(TOOL_BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)/include" \
-		     --with-extra-libs=$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
-		     --with-kernel-support
+OPROFILE_CONF_OPT :=	--localstatedir=/var \
+			--with-extra-includes="$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
+			-I$(TOOL_BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)/include" \
+			--with-extra-libs=$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
+			--with-kernel-support
 
 OPROFILE_BINARIES := utils/ophelp
 OPROFILE_BINARIES += pp/opannotate pp/oparchive pp/opgprof pp/opreport opjitconv/opjitconv
@@ -43,3 +44,4 @@ $(OPROFILE_TARGET_CLEAN):
 	rm -rf $(TARGET_DIR)/usr/share/oprofile
 	-$(MAKE) -C $(OPROFILE_DIR) clean
 	touch $@
+
-- 
2.30.2