diff options
Diffstat (limited to 'arch/powerpc/oprofile/op_model_power4.c')
-rw-r--r-- | arch/powerpc/oprofile/op_model_power4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c index 95ae77dec3f6..caffffa5b8f2 100644 --- a/arch/powerpc/oprofile/op_model_power4.c +++ b/arch/powerpc/oprofile/op_model_power4.c | |||
@@ -61,10 +61,10 @@ static int power4_reg_setup(struct op_counter_config *ctr, | |||
61 | else | 61 | else |
62 | mmcr0_val |= MMCR0_PROBLEM_DISABLE; | 62 | mmcr0_val |= MMCR0_PROBLEM_DISABLE; |
63 | 63 | ||
64 | if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) || | 64 | if (pvr_version_is(PVR_POWER4) || pvr_version_is(PVR_POWER4p) || |
65 | __is_processor(PV_970) || __is_processor(PV_970FX) || | 65 | pvr_version_is(PVR_970) || pvr_version_is(PVR_970FX) || |
66 | __is_processor(PV_970MP) || __is_processor(PV_970GX) || | 66 | pvr_version_is(PVR_970MP) || pvr_version_is(PVR_970GX) || |
67 | __is_processor(PV_POWER5) || __is_processor(PV_POWER5p)) | 67 | pvr_version_is(PVR_POWER5) || pvr_version_is(PVR_POWER5p)) |
68 | use_slot_nums = 1; | 68 | use_slot_nums = 1; |
69 | 69 | ||
70 | return 0; | 70 | return 0; |
@@ -84,9 +84,9 @@ extern void ppc_enable_pmcs(void); | |||
84 | */ | 84 | */ |
85 | static inline int mmcra_must_set_sample(void) | 85 | static inline int mmcra_must_set_sample(void) |
86 | { | 86 | { |
87 | if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) || | 87 | if (pvr_version_is(PVR_POWER4) || pvr_version_is(PVR_POWER4p) || |
88 | __is_processor(PV_970) || __is_processor(PV_970FX) || | 88 | pvr_version_is(PVR_970) || pvr_version_is(PVR_970FX) || |
89 | __is_processor(PV_970MP) || __is_processor(PV_970GX)) | 89 | pvr_version_is(PVR_970MP) || pvr_version_is(PVR_970GX)) |
90 | return 1; | 90 | return 1; |
91 | 91 | ||
92 | return 0; | 92 | return 0; |
@@ -276,7 +276,7 @@ static bool pmc_overflow(unsigned long val) | |||
276 | * PMCs because a user might set a period of less than 256 and we | 276 | * PMCs because a user might set a period of less than 256 and we |
277 | * don't want to mistakenly reset them. | 277 | * don't want to mistakenly reset them. |
278 | */ | 278 | */ |
279 | if (__is_processor(PV_POWER7) && ((0x80000000 - val) <= 256)) | 279 | if (pvr_version_is(PVR_POWER7) && ((0x80000000 - val) <= 256)) |
280 | return true; | 280 | return true; |
281 | 281 | ||
282 | return false; | 282 | return false; |