diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /arch/arm/kernel/perf_event.c | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
| -rw-r--r-- | arch/arm/kernel/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index c45a155a73dc..9e70f2053f9a 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c | |||
| @@ -966,7 +966,7 @@ armv6pmu_handle_irq(int irq_num, | |||
| 966 | */ | 966 | */ |
| 967 | armv6_pmcr_write(pmcr); | 967 | armv6_pmcr_write(pmcr); |
| 968 | 968 | ||
| 969 | data.addr = 0; | 969 | perf_sample_data_init(&data, 0); |
| 970 | 970 | ||
| 971 | cpuc = &__get_cpu_var(cpu_hw_events); | 971 | cpuc = &__get_cpu_var(cpu_hw_events); |
| 972 | for (idx = 0; idx <= armpmu->num_events; ++idx) { | 972 | for (idx = 0; idx <= armpmu->num_events; ++idx) { |
| @@ -1946,7 +1946,7 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev) | |||
| 1946 | */ | 1946 | */ |
| 1947 | regs = get_irq_regs(); | 1947 | regs = get_irq_regs(); |
| 1948 | 1948 | ||
| 1949 | data.addr = 0; | 1949 | perf_sample_data_init(&data, 0); |
| 1950 | 1950 | ||
| 1951 | cpuc = &__get_cpu_var(cpu_hw_events); | 1951 | cpuc = &__get_cpu_var(cpu_hw_events); |
| 1952 | for (idx = 0; idx <= armpmu->num_events; ++idx) { | 1952 | for (idx = 0; idx <= armpmu->num_events; ++idx) { |