diff options
| author | kraita <kraita@nvidia.com> | 2010-01-12 17:06:08 +0200 |
|---|---|---|
| committer | kraita <kraita@nvidia.com> | 2010-01-15 12:24:01 +0200 |
| commit | 544c117536af92ed1e97d0e84de452fb501eb172 (patch) | |
| tree | 76bb78f17c996cd9957ff836e8a6e8c82d2621ac | |
| parent | 075c532f2940f504549b85f308ee140d80cb1e13 (diff) | |
Oprofile: Force timer sampling for Android/ARMv7 combo
Change arm oprofile init return immediately with ENODEV when
configured for android and ARMv7. Failed init will cause
oprofile to take the default route of using timer-based sampling.
Without error return, oprofile will report "arm/a8" processor, which
seems to be completely unknown for oprofile daemon and host tools, and
oprofiler will not work.
For bug 640638
Change-Id: I59d7e2a417143d2093d86c29734e677fb546945d
| -rw-r--r-- | arch/arm/oprofile/common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c index 2680f4d4b2f3..11b1b38331d8 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c @@ -132,6 +132,9 @@ static void exit_driverfs(void) int __init oprofile_arch_init(struct oprofile_operations *ops) { +#if defined(CONFIG_ANDROID) && defined(CONFIG_CPU_V7) + return -ENODEV; +#else struct op_arm_model_spec *spec = NULL; int ret = -ENODEV; int cpu_arch = cpu_architecture(); @@ -188,6 +191,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) } return ret; +#endif } void oprofile_arch_exit(void) |