aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/power5+-pmu.c4
-rw-r--r--arch/powerpc/kernel/power5-pmu.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/power5+-pmu.c b/arch/powerpc/kernel/power5+-pmu.c
index c6cdfc165d6e..8471e3c2e465 100644
--- a/arch/powerpc/kernel/power5+-pmu.c
+++ b/arch/powerpc/kernel/power5+-pmu.c
@@ -242,7 +242,7 @@ static const unsigned char bytedecode_alternatives[4][4] = {
242 * event code for those that do, or -1 otherwise. This also handles 242 * event code for those that do, or -1 otherwise. This also handles
243 * alternative PCMSEL values for add events. 243 * alternative PCMSEL values for add events.
244 */ 244 */
245static int find_alternative_bdecode(unsigned int event) 245static s64 find_alternative_bdecode(u64 event)
246{ 246{
247 int pmc, altpmc, pp, j; 247 int pmc, altpmc, pp, j;
248 248
@@ -277,7 +277,7 @@ static int power5p_get_alternatives(u64 event, unsigned int flags, u64 alt[])
277{ 277{
278 int i, j, nalt = 1; 278 int i, j, nalt = 1;
279 int nlim; 279 int nlim;
280 u64 ae; 280 s64 ae;
281 281
282 alt[0] = event; 282 alt[0] = event;
283 nalt = 1; 283 nalt = 1;
diff --git a/arch/powerpc/kernel/power5-pmu.c b/arch/powerpc/kernel/power5-pmu.c
index d5344968ee9c..1b44c5fca189 100644
--- a/arch/powerpc/kernel/power5-pmu.c
+++ b/arch/powerpc/kernel/power5-pmu.c
@@ -250,7 +250,7 @@ static const unsigned char bytedecode_alternatives[4][4] = {
250 * PMCSEL values on other counters. This returns the alternative 250 * PMCSEL values on other counters. This returns the alternative
251 * event code for those that do, or -1 otherwise. 251 * event code for those that do, or -1 otherwise.
252 */ 252 */
253static u64 find_alternative_bdecode(u64 event) 253static s64 find_alternative_bdecode(u64 event)
254{ 254{
255 int pmc, altpmc, pp, j; 255 int pmc, altpmc, pp, j;
256 256
@@ -272,7 +272,7 @@ static u64 find_alternative_bdecode(u64 event)
272static int power5_get_alternatives(u64 event, unsigned int flags, u64 alt[]) 272static int power5_get_alternatives(u64 event, unsigned int flags, u64 alt[])
273{ 273{
274 int i, j, nalt = 1; 274 int i, j, nalt = 1;
275 u64 ae; 275 s64 ae;
276 276
277 alt[0] = event; 277 alt[0] = event;
278 nalt = 1; 278 nalt = 1;