diff options
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/perf_event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 6cc6521881aa..49643b1467e6 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c | |||
| @@ -1092,7 +1092,7 @@ armv6pmu_handle_irq(int irq_num, | |||
| 1092 | * platforms that can have the PMU interrupts raised as an NMI, this | 1092 | * platforms that can have the PMU interrupts raised as an NMI, this |
| 1093 | * will not work. | 1093 | * will not work. |
| 1094 | */ | 1094 | */ |
| 1095 | perf_event_do_pending(); | 1095 | irq_work_run(); |
| 1096 | 1096 | ||
| 1097 | return IRQ_HANDLED; | 1097 | return IRQ_HANDLED; |
| 1098 | } | 1098 | } |
| @@ -2068,7 +2068,7 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev) | |||
| 2068 | * platforms that can have the PMU interrupts raised as an NMI, this | 2068 | * platforms that can have the PMU interrupts raised as an NMI, this |
| 2069 | * will not work. | 2069 | * will not work. |
| 2070 | */ | 2070 | */ |
| 2071 | perf_event_do_pending(); | 2071 | irq_work_run(); |
| 2072 | 2072 | ||
| 2073 | return IRQ_HANDLED; | 2073 | return IRQ_HANDLED; |
| 2074 | } | 2074 | } |
| @@ -2436,7 +2436,7 @@ xscale1pmu_handle_irq(int irq_num, void *dev) | |||
| 2436 | armpmu->disable(hwc, idx); | 2436 | armpmu->disable(hwc, idx); |
| 2437 | } | 2437 | } |
| 2438 | 2438 | ||
| 2439 | perf_event_do_pending(); | 2439 | irq_work_run(); |
| 2440 | 2440 | ||
| 2441 | /* | 2441 | /* |
| 2442 | * Re-enable the PMU. | 2442 | * Re-enable the PMU. |
| @@ -2763,7 +2763,7 @@ xscale2pmu_handle_irq(int irq_num, void *dev) | |||
| 2763 | armpmu->disable(hwc, idx); | 2763 | armpmu->disable(hwc, idx); |
| 2764 | } | 2764 | } |
| 2765 | 2765 | ||
| 2766 | perf_event_do_pending(); | 2766 | irq_work_run(); |
| 2767 | 2767 | ||
| 2768 | /* | 2768 | /* |
| 2769 | * Re-enable the PMU. | 2769 | * Re-enable the PMU. |