Maemo patchset 20101501+0m5

[h-e-n] / arch / arm / oprofile / common.c

diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 3fcd752..d88a74b 100644 (file)
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -133,6 +133,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 
        ops->backtrace = arm_backtrace;
 
+/* comes first, so that it can be overrided by a better implementation */
+#ifdef CONFIG_OPROFILE_OMAP_GPTIMER
+       spec = &op_omap_gptimer_spec;
+#endif
+
 #ifdef CONFIG_CPU_XSCALE
        spec = &op_xscale_spec;
 #endif
@@ -144,11 +149,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 #ifdef CONFIG_OPROFILE_MPCORE
        spec = &op_mpcore_spec;
 #endif
-
+/*
 #ifdef CONFIG_OPROFILE_ARMV7
        spec = &op_armv7_spec;
 #endif
-
+*/
        if (spec) {
                ret = spec->init();
                if (ret < 0)