From 950a40faab9a81a85c8d1a443536df138ad7cba7 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 13 Mar 2009 12:21:28 +0100 Subject: [PATCH] --- yaml --- r: 147247 b: refs/heads/master c: 595258aaeac4cc6e187b98b1bf29bb176febe763 h: refs/heads/master i: 147245: 464d9837cd627c97725112f90a3f12f5d56281c0 147243: a87699f971f905f41ae9ce485e03d4946eca3751 147239: 5ddbb323815c4f4ef0165bd96a38c1cb5564ca08 147231: d63ac8c6d59de75fe1af1be3994985e03ccb4885 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_counter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0f0cb54bda92..68ee28630648 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f541ae326fa120fa5c57433e4d9a133df212ce41 +refs/heads/master: 595258aaeac4cc6e187b98b1bf29bb176febe763 diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c index 155bc3c239b6..1cedc3468ce5 100644 --- a/trunk/arch/x86/kernel/cpu/perf_counter.c +++ b/trunk/arch/x86/kernel/cpu/perf_counter.c @@ -449,7 +449,7 @@ __hw_perf_counter_set_period(struct perf_counter *counter, struct hw_perf_counter *hwc, int idx) { s64 left = atomic64_read(&hwc->period_left); - s32 period = hwc->irq_period; + s64 period = hwc->irq_period; int err; /*