diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/arm/oprofile/common.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/arm/oprofile/common.c')
| -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 0a5cf3a6438b..3fcd752d6146 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c | |||
| @@ -145,6 +145,10 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
| 145 | spec = &op_mpcore_spec; | 145 | spec = &op_mpcore_spec; |
| 146 | #endif | 146 | #endif |
| 147 | 147 | ||
| 148 | #ifdef CONFIG_OPROFILE_ARMV7 | ||
| 149 | spec = &op_armv7_spec; | ||
| 150 | #endif | ||
| 151 | |||
| 148 | if (spec) { | 152 | if (spec) { |
| 149 | ret = spec->init(); | 153 | ret = spec->init(); |
| 150 | if (ret < 0) | 154 | if (ret < 0) |