diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2011-06-22 16:24:08 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-06-22 16:24:20 +0200 |
| commit | b530ce7a1af5a9355be518557d86b33c6d2cf088 (patch) | |
| tree | 6c648c5f2085976be8d53afbad60696288296bec /arch | |
| parent | 80629b0b0fd5ca868dc8eced28e6101e39ac2ef6 (diff) | |
| download | linux-3.10-b530ce7a1af5a9355be518557d86b33c6d2cf088.tar.gz linux-3.10-b530ce7a1af5a9355be518557d86b33c6d2cf088.tar.bz2 linux-3.10-b530ce7a1af5a9355be518557d86b33c6d2cf088.zip | |
[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 <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/oprofile/init.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c index 5995e9bc72d..5e2ab03eaff 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; |