diff options
| author | Shuah Khan <shuahkhan@gmail.com> | 2012-06-11 03:13:41 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-11 08:52:12 (GMT) |
| commit | e2b297fcf17fc03734e93387fb8195c782286b35 (patch) | |
| tree | ef058e891404caa3194058a602c1285805e7af74 /arch/x86/kernel | |
| parent | c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7 (diff) | |
| download | linux-fsl-qoriq-e2b297fcf17fc03734e93387fb8195c782286b35.tar.xz | |
perf/x86: Convert obsolete simple_strtoul() usage to kstrtoul()
Signed-off-by: Shuah Khan <shuahkhan@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1339384421.3025.8.camel@lorien2
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 000a474..766c76d 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1640,7 +1640,12 @@ static ssize_t set_attr_rdpmc(struct device *cdev, struct device_attribute *attr, const char *buf, size_t count) { - unsigned long val = simple_strtoul(buf, NULL, 0); + unsigned long val; + ssize_t ret; + + ret = kstrtoul(buf, 0, &val); + if (ret) + return ret; if (!!val != !!x86_pmu.attr_rdpmc) { x86_pmu.attr_rdpmc = !!val; |