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

Commit e9abf4c5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/tracing/ftrace' of...

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
parents da74ff0f 0cfe8245
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -3328,7 +3328,7 @@ create_trace_option_files(struct tracer *tracer)
	for (cnt = 0; opts[cnt].name; cnt++)
	for (cnt = 0; opts[cnt].name; cnt++)
		;
		;


	topts = kzalloc(sizeof(*topts) * (cnt + 1), GFP_KERNEL);
	topts = kcalloc(cnt + 1, sizeof(*topts), GFP_KERNEL);
	if (!topts)
	if (!topts)
		return NULL;
		return NULL;