diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
| commit | b79b3e05b1229d5b2fc2af71dc29701642577eba (patch) | |
| tree | bcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /arch/arm/kernel/perf_event_xscale.c | |
| parent | b8e513a2ecafb5bb068c00be98d584871afcd4c3 (diff) | |
| parent | c5ad48f3117c4aae379b536f3270fc1efae945c0 (diff) | |
| download | blackbird-op-linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.gz blackbird-op-linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.zip | |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/arm/kernel/perf_event_xscale.c')
| -rw-r--r-- | arch/arm/kernel/perf_event_xscale.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/kernel/perf_event_xscale.c b/arch/arm/kernel/perf_event_xscale.c index 39affbe4fdb2..3c4397491d08 100644 --- a/arch/arm/kernel/perf_event_xscale.c +++ b/arch/arm/kernel/perf_event_xscale.c @@ -144,6 +144,20 @@ static const unsigned xscale_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] [C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED, }, }, + [C(NODE)] = { + [C(OP_READ)] = { + [C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED, + [C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED, + }, + [C(OP_WRITE)] = { + [C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED, + [C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED, + }, + [C(OP_PREFETCH)] = { + [C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED, + [C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED, + }, + }, }; #define XSCALE_PMU_ENABLE 0x001 @@ -251,7 +265,7 @@ xscale1pmu_handle_irq(int irq_num, void *dev) if (!armpmu_event_set_period(event, hwc, idx)) continue; - if (perf_event_overflow(event, 0, &data, regs)) + if (perf_event_overflow(event, &data, regs)) armpmu->disable(hwc, idx); } @@ -583,7 +597,7 @@ xscale2pmu_handle_irq(int irq_num, void *dev) if (!armpmu_event_set_period(event, hwc, idx)) continue; - if (perf_event_overflow(event, 0, &data, regs)) + if (perf_event_overflow(event, &data, regs)) armpmu->disable(hwc, idx); } |
