Commit 164109e3 authored by Daniel Walter's avatar Daniel Walter Committed by Linus Torvalds
Browse files

arch/x86: replace strict_strto calls 



Replace obsolete strict_strto calls with appropriate kstrto calls

Signed-off-by: default avatarDaniel Walter <dwalter@google.com>
Acked-by: default avatarBorislav 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1618bd53

arch/x86/kernel/cpu/intel_cacheinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf, 


	cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map));



	if (strict_strtoul(buf, 10, &val) < 0)

	if (kstrtoul(buf, 10, &val) < 0)

		return -EINVAL;



	err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val);
@@ -511,7 +511,7 @@ store_subcaches(struct _cpuid4_info *this_leaf, const char *buf, size_t count, 
	if (!this_leaf->base.nb || !amd_nb_has_feature(AMD_NB_L3_PARTITIONING))

		return -EINVAL;



	if (strict_strtoul(buf, 16, &val) < 0)

	if (kstrtoul(buf, 16, &val) < 0)

		return -EINVAL;



	if (amd_set_subcaches(cpu, val))

arch/x86/kernel/cpu/mcheck/mce.c

+3 −3
Original line number Diff line number Diff line
@@ -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) {

arch/x86/kernel/cpu/mcheck/mce_amd.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

arch/x86/kvm/mmu_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int mmu_audit_set(const char *val, const struct kernel_param *kp) 
	int ret;

	unsigned long enable;



	ret = strict_strtoul(val, 10, &enable);

	ret = kstrtoul(val, 10, &enable);

	if (ret < 0)

		return -EINVAL;

arch/x86/platform/uv/tlb_uv.c

+1 −1
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ static ssize_t ptc_proc_write(struct file *file, const char __user *user, 
		return count;

	}



	if (strict_strtol(optstr, 10, &input_arg) < 0) {

	if (kstrtol(optstr, 10, &input_arg) < 0) {

		printk(KERN_DEBUG "%s is invalid\n", optstr);

		return -EINVAL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE