Commit c9e03d59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

Pull fprobe update from Masami Hiramatsu:

 - do not zero out unused fgraph_data. This removes unneeded memset of
   fgraph_data in fprobe entry handler.

* tag 'probes-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: fprobe: do not zero out unused fgraph_data
parents 829000f7 e0a38443

kernel/trace/fprobe.c

+0 −2
Original line number Diff line number Diff line
@@ -450,8 +450,6 @@ static int fprobe_fgraph_entry(struct ftrace_graph_ent *trace, struct fgraph_ops 
				used += FPROBE_HEADER_SIZE_IN_LONG + size_words;

		}

	}

	if (used < reserved_words)

		memset(fgraph_data + used, 0, reserved_words - used);



	/* If any exit_handler is set, data must be used. */

	return used != 0;