diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/kernel/perf_event.c | 2 | ||||
-rw-r--r-- | arch/arm/kernel/perf_event_v6.c | 12 | ||||
-rw-r--r-- | arch/arm/kernel/perf_event_v7.c | 16 | ||||
-rw-r--r-- | arch/arm/kernel/perf_event_xscale.c | 12 |
4 files changed, 21 insertions, 21 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 53c9c2610cb..73049963bf4 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c | |||
@@ -90,7 +90,7 @@ struct arm_pmu { | |||
90 | }; | 90 | }; |
91 | 91 | ||
92 | /* Set at runtime when we know what CPU type we are. */ | 92 | /* Set at runtime when we know what CPU type we are. */ |
93 | static const struct arm_pmu *armpmu; | 93 | static struct arm_pmu *armpmu; |
94 | 94 | ||
95 | enum arm_perf_pmu_ids | 95 | enum arm_perf_pmu_ids |
96 | armpmu_get_pmu_id(void) | 96 | armpmu_get_pmu_id(void) |
diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c index dd7f3b9f4cb..d1abe97ae08 100644 --- a/arch/arm/kernel/perf_event_v6.c +++ b/arch/arm/kernel/perf_event_v6.c | |||
@@ -635,7 +635,7 @@ armv6mpcore_pmu_disable_event(struct hw_perf_event *hwc, | |||
635 | raw_spin_unlock_irqrestore(&pmu_lock, flags); | 635 | raw_spin_unlock_irqrestore(&pmu_lock, flags); |
636 | } | 636 | } |
637 | 637 | ||
638 | static const struct arm_pmu armv6pmu = { | 638 | static struct arm_pmu armv6pmu = { |
639 | .id = ARM_PERF_PMU_ID_V6, | 639 | .id = ARM_PERF_PMU_ID_V6, |
640 | .name = "v6", | 640 | .name = "v6", |
641 | .handle_irq = armv6pmu_handle_irq, | 641 | .handle_irq = armv6pmu_handle_irq, |
@@ -653,7 +653,7 @@ static const struct arm_pmu armv6pmu = { | |||
653 | .max_period = (1LLU << 32) - 1, | 653 | .max_period = (1LLU << 32) - 1, |
654 | }; | 654 | }; |
655 | 655 | ||
656 | static const struct arm_pmu *__init armv6pmu_init(void) | 656 | static struct arm_pmu *__init armv6pmu_init(void) |
657 | { | 657 | { |
658 | return &armv6pmu; | 658 | return &armv6pmu; |
659 | } | 659 | } |
@@ -665,7 +665,7 @@ static const struct arm_pmu *__init armv6pmu_init(void) | |||
665 | * disable the interrupt reporting and update the event. When unthrottling we | 665 | * disable the interrupt reporting and update the event. When unthrottling we |
666 | * reset the period and enable the interrupt reporting. | 666 | * reset the period and enable the interrupt reporting. |
667 | */ | 667 | */ |
668 | static const struct arm_pmu armv6mpcore_pmu = { | 668 | static struct arm_pmu armv6mpcore_pmu = { |
669 | .id = ARM_PERF_PMU_ID_V6MP, | 669 | .id = ARM_PERF_PMU_ID_V6MP, |
670 | .name = "v6mpcore", | 670 | .name = "v6mpcore", |
671 | .handle_irq = armv6pmu_handle_irq, | 671 | .handle_irq = armv6pmu_handle_irq, |
@@ -683,17 +683,17 @@ static const struct arm_pmu armv6mpcore_pmu = { | |||
683 | .max_period = (1LLU << 32) - 1, | 683 | .max_period = (1LLU << 32) - 1, |
684 | }; | 684 | }; |
685 | 685 | ||
686 | static const struct arm_pmu *__init armv6mpcore_pmu_init(void) | 686 | static struct arm_pmu *__init armv6mpcore_pmu_init(void) |
687 | { | 687 | { |
688 | return &armv6mpcore_pmu; | 688 | return &armv6mpcore_pmu; |
689 | } | 689 | } |
690 | #else | 690 | #else |
691 | static const struct arm_pmu *__init armv6pmu_init(void) | 691 | static struct arm_pmu *__init armv6pmu_init(void) |
692 | { | 692 | { |
693 | return NULL; | 693 | return NULL; |
694 | } | 694 | } |
695 | 695 | ||
696 | static const struct arm_pmu *__init armv6mpcore_pmu_init(void) | 696 | static struct arm_pmu *__init armv6mpcore_pmu_init(void) |
697 | { | 697 | { |
698 | return NULL; | 698 | return NULL; |
699 | } | 699 | } |
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c index 4c851834f68..74f9119906d 100644 --- a/arch/arm/kernel/perf_event_v7.c +++ b/arch/arm/kernel/perf_event_v7.c | |||
@@ -1188,7 +1188,7 @@ static u32 __init armv7_read_num_pmnc_events(void) | |||
1188 | return nb_cnt + 1; | 1188 | return nb_cnt + 1; |
1189 | } | 1189 | } |
1190 | 1190 | ||
1191 | static const struct arm_pmu *__init armv7_a8_pmu_init(void) | 1191 | static struct arm_pmu *__init armv7_a8_pmu_init(void) |
1192 | { | 1192 | { |
1193 | armv7pmu.id = ARM_PERF_PMU_ID_CA8; | 1193 | armv7pmu.id = ARM_PERF_PMU_ID_CA8; |
1194 | armv7pmu.name = "ARMv7 Cortex-A8"; | 1194 | armv7pmu.name = "ARMv7 Cortex-A8"; |
@@ -1198,7 +1198,7 @@ static const struct arm_pmu *__init armv7_a8_pmu_init(void) | |||
1198 | return &armv7pmu; | 1198 | return &armv7pmu; |
1199 | } | 1199 | } |
1200 | 1200 | ||
1201 | static const struct arm_pmu *__init armv7_a9_pmu_init(void) | 1201 | static struct arm_pmu *__init armv7_a9_pmu_init(void) |
1202 | { | 1202 | { |
1203 | armv7pmu.id = ARM_PERF_PMU_ID_CA9; | 1203 | armv7pmu.id = ARM_PERF_PMU_ID_CA9; |
1204 | armv7pmu.name = "ARMv7 Cortex-A9"; | 1204 | armv7pmu.name = "ARMv7 Cortex-A9"; |
@@ -1208,7 +1208,7 @@ static const struct arm_pmu *__init armv7_a9_pmu_init(void) | |||
1208 | return &armv7pmu; | 1208 | return &armv7pmu; |
1209 | } | 1209 | } |
1210 | 1210 | ||
1211 | static const struct arm_pmu *__init armv7_a5_pmu_init(void) | 1211 | static struct arm_pmu *__init armv7_a5_pmu_init(void) |
1212 | { | 1212 | { |
1213 | armv7pmu.id = ARM_PERF_PMU_ID_CA5; | 1213 | armv7pmu.id = ARM_PERF_PMU_ID_CA5; |
1214 | armv7pmu.name = "ARMv7 Cortex-A5"; | 1214 | armv7pmu.name = "ARMv7 Cortex-A5"; |
@@ -1218,7 +1218,7 @@ static const struct arm_pmu *__init armv7_a5_pmu_init(void) | |||
1218 | return &armv7pmu; | 1218 | return &armv7pmu; |
1219 | } | 1219 | } |
1220 | 1220 | ||
1221 | static const struct arm_pmu *__init armv7_a15_pmu_init(void) | 1221 | static struct arm_pmu *__init armv7_a15_pmu_init(void) |
1222 | { | 1222 | { |
1223 | armv7pmu.id = ARM_PERF_PMU_ID_CA15; | 1223 | armv7pmu.id = ARM_PERF_PMU_ID_CA15; |
1224 | armv7pmu.name = "ARMv7 Cortex-A15"; | 1224 | armv7pmu.name = "ARMv7 Cortex-A15"; |
@@ -1228,22 +1228,22 @@ static const struct arm_pmu *__init armv7_a15_pmu_init(void) | |||
1228 | return &armv7pmu; | 1228 | return &armv7pmu; |
1229 | } | 1229 | } |
1230 | #else | 1230 | #else |
1231 | static const struct arm_pmu *__init armv7_a8_pmu_init(void) | 1231 | static struct arm_pmu *__init armv7_a8_pmu_init(void) |
1232 | { | 1232 | { |
1233 | return NULL; | 1233 | return NULL; |
1234 | } | 1234 | } |
1235 | 1235 | ||
1236 | static const struct arm_pmu *__init armv7_a9_pmu_init(void) | 1236 | static struct arm_pmu *__init armv7_a9_pmu_init(void) |
1237 | { | 1237 | { |
1238 | return NULL; | 1238 | return NULL; |
1239 | } | 1239 | } |
1240 | 1240 | ||
1241 | static const struct arm_pmu *__init armv7_a5_pmu_init(void) | 1241 | static struct arm_pmu *__init armv7_a5_pmu_init(void) |
1242 | { | 1242 | { |
1243 | return NULL; | 1243 | return NULL; |
1244 | } | 1244 | } |
1245 | 1245 | ||
1246 | static const struct arm_pmu *__init armv7_a15_pmu_init(void) | 1246 | static struct arm_pmu *__init armv7_a15_pmu_init(void) |
1247 | { | 1247 | { |
1248 | return NULL; | 1248 | return NULL; |
1249 | } | 1249 | } |
diff --git a/arch/arm/kernel/perf_event_xscale.c b/arch/arm/kernel/perf_event_xscale.c index 3c4397491d0..730b1c29986 100644 --- a/arch/arm/kernel/perf_event_xscale.c +++ b/arch/arm/kernel/perf_event_xscale.c | |||
@@ -424,7 +424,7 @@ xscale1pmu_write_counter(int counter, u32 val) | |||
424 | } | 424 | } |
425 | } | 425 | } |
426 | 426 | ||
427 | static const struct arm_pmu xscale1pmu = { | 427 | static struct arm_pmu xscale1pmu = { |
428 | .id = ARM_PERF_PMU_ID_XSCALE1, | 428 | .id = ARM_PERF_PMU_ID_XSCALE1, |
429 | .name = "xscale1", | 429 | .name = "xscale1", |
430 | .handle_irq = xscale1pmu_handle_irq, | 430 | .handle_irq = xscale1pmu_handle_irq, |
@@ -442,7 +442,7 @@ static const struct arm_pmu xscale1pmu = { | |||
442 | .max_period = (1LLU << 32) - 1, | 442 | .max_period = (1LLU << 32) - 1, |
443 | }; | 443 | }; |
444 | 444 | ||
445 | static const struct arm_pmu *__init xscale1pmu_init(void) | 445 | static struct arm_pmu *__init xscale1pmu_init(void) |
446 | { | 446 | { |
447 | return &xscale1pmu; | 447 | return &xscale1pmu; |
448 | } | 448 | } |
@@ -786,7 +786,7 @@ xscale2pmu_write_counter(int counter, u32 val) | |||
786 | } | 786 | } |
787 | } | 787 | } |
788 | 788 | ||
789 | static const struct arm_pmu xscale2pmu = { | 789 | static struct arm_pmu xscale2pmu = { |
790 | .id = ARM_PERF_PMU_ID_XSCALE2, | 790 | .id = ARM_PERF_PMU_ID_XSCALE2, |
791 | .name = "xscale2", | 791 | .name = "xscale2", |
792 | .handle_irq = xscale2pmu_handle_irq, | 792 | .handle_irq = xscale2pmu_handle_irq, |
@@ -804,17 +804,17 @@ static const struct arm_pmu xscale2pmu = { | |||
804 | .max_period = (1LLU << 32) - 1, | 804 | .max_period = (1LLU << 32) - 1, |
805 | }; | 805 | }; |
806 | 806 | ||
807 | static const struct arm_pmu *__init xscale2pmu_init(void) | 807 | static struct arm_pmu *__init xscale2pmu_init(void) |
808 | { | 808 | { |
809 | return &xscale2pmu; | 809 | return &xscale2pmu; |
810 | } | 810 | } |
811 | #else | 811 | #else |
812 | static const struct arm_pmu *__init xscale1pmu_init(void) | 812 | static struct arm_pmu *__init xscale1pmu_init(void) |
813 | { | 813 | { |
814 | return NULL; | 814 | return NULL; |
815 | } | 815 | } |
816 | 816 | ||
817 | static const struct arm_pmu *__init xscale2pmu_init(void) | 817 | static struct arm_pmu *__init xscale2pmu_init(void) |
818 | { | 818 | { |
819 | return NULL; | 819 | return NULL; |
820 | } | 820 | } |