diff options
Diffstat (limited to 'arch/powerpc/kernel/ppc970-pmu.c')
-rw-r--r-- | arch/powerpc/kernel/ppc970-pmu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/ppc970-pmu.c b/arch/powerpc/kernel/ppc970-pmu.c index af2d1884058c..eed47c4523f1 100644 --- a/arch/powerpc/kernel/ppc970-pmu.c +++ b/arch/powerpc/kernel/ppc970-pmu.c | |||
@@ -147,7 +147,7 @@ static unsigned char direct_marked_event[8] = { | |||
147 | * Returns 1 if event counts things relating to marked instructions | 147 | * Returns 1 if event counts things relating to marked instructions |
148 | * and thus needs the MMCRA_SAMPLE_ENABLE bit set, or 0 if not. | 148 | * and thus needs the MMCRA_SAMPLE_ENABLE bit set, or 0 if not. |
149 | */ | 149 | */ |
150 | static int p970_marked_instr_event(unsigned int event) | 150 | static int p970_marked_instr_event(u64 event) |
151 | { | 151 | { |
152 | int pmc, psel, unit, byte, bit; | 152 | int pmc, psel, unit, byte, bit; |
153 | unsigned int mask; | 153 | unsigned int mask; |
@@ -192,7 +192,7 @@ static u64 unit_cons[PM_LASTUNIT+1][2] = { | |||
192 | [PM_STS] = { 0x380000000000ull, 0x310000000000ull }, | 192 | [PM_STS] = { 0x380000000000ull, 0x310000000000ull }, |
193 | }; | 193 | }; |
194 | 194 | ||
195 | static int p970_get_constraint(unsigned int event, u64 *maskp, u64 *valp) | 195 | static int p970_get_constraint(u64 event, u64 *maskp, u64 *valp) |
196 | { | 196 | { |
197 | int pmc, byte, unit, sh, spcsel; | 197 | int pmc, byte, unit, sh, spcsel; |
198 | u64 mask = 0, value = 0; | 198 | u64 mask = 0, value = 0; |
@@ -243,8 +243,7 @@ static int p970_get_constraint(unsigned int event, u64 *maskp, u64 *valp) | |||
243 | return 0; | 243 | return 0; |
244 | } | 244 | } |
245 | 245 | ||
246 | static int p970_get_alternatives(unsigned int event, unsigned int flags, | 246 | static int p970_get_alternatives(u64 event, unsigned int flags, u64 alt[]) |
247 | unsigned int alt[]) | ||
248 | { | 247 | { |
249 | alt[0] = event; | 248 | alt[0] = event; |
250 | 249 | ||
@@ -257,7 +256,7 @@ static int p970_get_alternatives(unsigned int event, unsigned int flags, | |||
257 | return 1; | 256 | return 1; |
258 | } | 257 | } |
259 | 258 | ||
260 | static int p970_compute_mmcr(unsigned int event[], int n_ev, | 259 | static int p970_compute_mmcr(u64 event[], int n_ev, |
261 | unsigned int hwc[], u64 mmcr[]) | 260 | unsigned int hwc[], u64 mmcr[]) |
262 | { | 261 | { |
263 | u64 mmcr0 = 0, mmcr1 = 0, mmcra = 0; | 262 | u64 mmcr0 = 0, mmcr1 = 0, mmcra = 0; |