Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcd83ea6 authored Sep 26, 2012 by Daniel Walter Committed by Steven Rostedt Oct 31, 2012

tracing: Replace strict_strto* with kstrto*

 * remove old string conversions with kstrto*

Link: http://lkml.kernel.org/r/20120926200838.GC1244@0x90.at



Signed-off-by: Daniel Walter <sahne@0x90.at>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent 95d18aa2

kernel/trace/ftrace.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4381,7 +4381,7 @@ ftrace_pid_write(struct file filp, const char __user ubuf,
	if (strlen(tmp) == 0)		if (strlen(tmp) == 0)
	return 1;		return 1;

	ret = strict_strtol(tmp, 10, &val);		ret = kstrtol(tmp, 10, &val);
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;

kernel/trace/trace.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -431,7 +431,7 @@ static int __init set_tracing_thresh(char *str)

	if (!str)		if (!str)
	return 0;		return 0;
	ret = strict_strtoul(str, 0, &threshold);		ret = kstrtoul(str, 0, &threshold);
	if (ret < 0)		if (ret < 0)
	return 0;		return 0;
	tracing_thresh = threshold * 1000;		tracing_thresh = threshold * 1000;

kernel/trace/trace_events_filter.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1000,9 +1000,9 @@ static int init_pred(struct filter_parse_state *ps,
	}		}
	} else {		} else {
	if (field->is_signed)		if (field->is_signed)
	ret = strict_strtoll(pred->regex.pattern, 0, &val);		ret = kstrtoll(pred->regex.pattern, 0, &val);
	else		else
	ret = strict_strtoull(pred->regex.pattern, 0, &val);		ret = kstrtoull(pred->regex.pattern, 0, &val);
	if (ret) {		if (ret) {
	parse_error(ps, FILT_ERR_ILLEGAL_INTVAL, 0);		parse_error(ps, FILT_ERR_ILLEGAL_INTVAL, 0);
	return -EINVAL;		return -EINVAL;

kernel/trace/trace_functions.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -366,7 +366,7 @@ ftrace_trace_onoff_callback(struct ftrace_hash *hash,
	* We use the callback data field (which is a pointer)		* We use the callback data field (which is a pointer)
	* as our counter.		* as our counter.
	*/		*/
	ret = strict_strtoul(number, 0, (unsigned long *)&count);		ret = kstrtoul(number, 0, (unsigned long *)&count);
	if (ret)		if (ret)
	return ret;		return ret;

kernel/trace/trace_kprobe.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -444,7 +444,7 @@ static int create_trace_probe(int argc, char **argv)
	return -EINVAL;		return -EINVAL;
	}		}
	/* an address specified */		/* an address specified */
	ret = strict_strtoul(&argv[1][0], 0, (unsigned long *)&addr);		ret = kstrtoul(&argv[1][0], 0, (unsigned long *)&addr);
	if (ret) {		if (ret) {
	pr_info("Failed to parse address.\n");		pr_info("Failed to parse address.\n");
	return ret;		return ret;