diff options
| author |   Stephen Warren <swarren@nvidia.com> | 2013-01-28 11:22:46 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 11:22:46 -0700 |
| commit | ee059485175b21079d3639f167980d354afb3d4b (patch) | |
| tree | 30bf32ec57ba915d31348c1b603481baf42c81dd /arch/arm/kernel/perf_event_xscale.c | |
| parent | ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode (diff) | |
| parent | ARM: OMAP: Make use of available scu_a9_get_base() interface (diff) | |
| download | linux-dev-ee059485175b21079d3639f167980d354afb3d4b.tar.xz linux-dev-ee059485175b21079d3639f167980d354afb3d4b.zip | |
Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114
Conflicts:
arch/arm/mach-tegra/platsmp.c
Diffstat (limited to 'arch/arm/kernel/perf_event_xscale.c')
| -rw-r--r-- | arch/arm/kernel/perf_event_xscale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event_xscale.c b/arch/arm/kernel/perf_event_xscale.c index 2b0fe30ec12e..63990c42fac9 100644 --- a/arch/arm/kernel/perf_event_xscale.c +++ b/arch/arm/kernel/perf_event_xscale.c @@ -83,7 +83,7 @@ static const unsigned xscale_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] }, [C(OP_WRITE)] = { [C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED, - [C(RESULT_MISS)] = XSCALE_PERFCTR_ICACHE_MISS, + [C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED, }, [C(OP_PREFETCH)] = { [C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED, |