From: Christian Borntraeger Date: Wed, 22 Jun 2011 14:24:08 +0000 (+0200) Subject: [S390] s390: enforce HW limits for the initial sampling rate X-Git-Tag: v3.12-rc1~5509^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b530ce7a1af5a9355be518557d86b33c6d2cf088;p=kernel%2Fkernel-generic.git [S390] s390: enforce HW limits for the initial sampling rate On specific configurations with hwsampler opcontrol --start returns an error on "echo 1 >/dev/oprofile/enable". Turns out that the hw sampling interval is not checked against the hardware limits. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c index 5995e9b..5e2ab03 100644 --- a/arch/s390/oprofile/init.c +++ b/arch/s390/oprofile/init.c @@ -151,6 +151,12 @@ static int oprofile_hwsampler_init(struct oprofile_operations *ops) if (oprofile_max_interval == 0) return -ENODEV; + /* The initial value should be sane */ + if (oprofile_hw_interval < oprofile_min_interval) + oprofile_hw_interval = oprofile_min_interval; + if (oprofile_hw_interval > oprofile_max_interval) + oprofile_hw_interval = oprofile_max_interval; + if (oprofile_timer_init(ops)) return -ENODEV;