[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1248800846-25422-8-git-send-email-robert.richter@amd.com>
Date: Tue, 28 Jul 2009 19:07:07 +0200
From: Robert Richter <robert.richter@....com>
To: Ingo Molnar <mingo@...e.hu>
CC: LKML <linux-kernel@...r.kernel.org>,
oprofile-list <oprofile-list@...ts.sourceforge.net>,
Robert Richter <robert.richter@....com>
Subject: [PATCH 07/26] oprofile: oprofile_set_timeout(), return with error for invalid args
Return with -EINVAL for invalid parameters instead of setting the
default value in oprofile_set_timeout().
Signed-off-by: Robert Richter <robert.richter@....com>
---
drivers/oprofile/oprof.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index 7bc64af..42c9c76 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -196,6 +196,7 @@ post_sync:
int oprofile_set_timeout(unsigned long val_msec)
{
int err = 0;
+ unsigned long time_slice;
mutex_lock(&start_mutex);
@@ -209,9 +210,13 @@ int oprofile_set_timeout(unsigned long val_msec)
goto out;
}
- timeout_jiffies = msecs_to_jiffies(val_msec);
- if (timeout_jiffies == MAX_JIFFY_OFFSET)
- timeout_jiffies = msecs_to_jiffies(MULTIPLEXING_TIMER_DEFAULT);
+ time_slice = msecs_to_jiffies(val_msec);
+ if (time_slice == MAX_JIFFY_OFFSET) {
+ err = -EINVAL;
+ goto out;
+ }
+
+ timeout_jiffies = time_slice;
out:
mutex_unlock(&start_mutex);
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists