arch/x86: replace strict_strto calls

Replace obsolete strict_strto calls with appropriate kstrto calls

Signed-off-by: Daniel Walter <dwalter@google.com>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 4fc57975acc1..bd9ccda8087f 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2136,7 +2136,7 @@ static ssize_t set_bank(struct device *s, struct device_attribute *attr,
 {
         u64 new;
 
-        if (strict_strtoull(buf, 0, &new) < 0)
+        if (kstrtou64(buf, 0, &new) < 0)
                 return -EINVAL;
 
         attr_to_bank(attr)->ctl = new;
@@ -2174,7 +2174,7 @@ static ssize_t set_ignore_ce(struct device *s,
 {
         u64 new;
 
-        if (strict_strtoull(buf, 0, &new) < 0)
+        if (kstrtou64(buf, 0, &new) < 0)
                 return -EINVAL;
 
         if (mca_cfg.ignore_ce ^ !!new) {
@@ -2198,7 +2198,7 @@ static ssize_t set_cmci_disabled(struct device *s,
 {
         u64 new;
 
-        if (strict_strtoull(buf, 0, &new) < 0)
+        if (kstrtou64(buf, 0, &new) < 0)
                 return -EINVAL;
 
         if (mca_cfg.cmci_disabled ^ !!new) {
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 603df4f74640..1e49f8f41276 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -353,7 +353,7 @@ store_interrupt_enable(struct threshold_block *b, const char *buf, size_t size)
         if (!b->interrupt_capable)
                 return -EINVAL;
 
-        if (strict_strtoul(buf, 0, &new) < 0)
+        if (kstrtoul(buf, 0, &new) < 0)
                 return -EINVAL;
 
         b->interrupt_enable = !!new;
@@ -372,7 +372,7 @@ store_threshold_limit(struct threshold_block *b, const char *buf, size_t size)
         struct thresh_restart tr;
         unsigned long new;
 
-        if (strict_strtoul(buf, 0, &new) < 0)
+        if (kstrtoul(buf, 0, &new) < 0)
                 return -EINVAL;
 
         if (new > THRESHOLD_MAX)