---

yaml --- r: 254053 b: refs/heads/master c: b530ce7 h: refs/heads/master i: 254051: dafdfc7 v: v3
git-mirror · Jun 22, 2011 · d79d766 · d79d766
1 parent 8e24bf8
commit d79d766
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80629b0b0fd5ca868dc8eced28e6101e39ac2ef6
+refs/heads/master: b530ce7a1af5a9355be518557d86b33c6d2cf088
diff --git a/trunk/arch/s390/oprofile/init.c b/trunk/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;