diff options
| author | Shuah Khan <shuahkhan@gmail.com> | 2012-05-06 11:11:04 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-15 08:10:31 -0700 |
| commit | a434a3c014dfc52d07efa7817f1339124300aed4 (patch) | |
| tree | e691dfa81949dbe01312bc6dfbfb524fafa5982d /arch | |
| parent | 575b5ea19669112f9f7a7e2c09e9cdb914f4683e (diff) | |
| download | linux-3.10-a434a3c014dfc52d07efa7817f1339124300aed4.tar.gz linux-3.10-a434a3c014dfc52d07efa7817f1339124300aed4.tar.bz2 linux-3.10-a434a3c014dfc52d07efa7817f1339124300aed4.zip | |
x86, microcode: microcode_core.c simple_strtoul cleanup
commit e826abd523913f63eb03b59746ffb16153c53dc4 upstream.
Change reload_for_cpu() in kernel/microcode_core.c to call kstrtoul()
instead of calling obsoleted simple_strtoul().
Signed-off-by: Shuah Khan <shuahkhan@gmail.com>
Reviewed-by: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1336324264.2897.9.camel@lorien2
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/microcode_core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c index c9bda6d6035..fbdfc691718 100644 --- a/arch/x86/kernel/microcode_core.c +++ b/arch/x86/kernel/microcode_core.c @@ -299,12 +299,11 @@ static ssize_t reload_store(struct device *dev, { unsigned long val; int cpu = dev->id; - int ret = 0; - char *end; + ssize_t ret = 0; - val = simple_strtoul(buf, &end, 0); - if (end == buf) - return -EINVAL; + ret = kstrtoul(buf, 0, &val); + if (ret) + return ret; if (val == 1) { get_online_cpus(); |