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

Commit 26a3b01b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fixes from Steven Rostedt:
 "Three small fixes:

   - A fix to a double free in the histogram code

   - Uninitialized variable fix

   - Use NULL instead of zero fix and spelling fixes"

* tag 'trace-v5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace: Fix warning using plain integer as NULL & spelling corrections
  tracing: initialize variable in create_dyn_event()
  tracing: Remove unnecessary var_ref destroy in track_data_destroy()
parents 9798a22d 9efb85c5

kernel/trace/ftrace.c

+6 −6
Original line number Diff line number Diff line
@@ -1992,7 +1992,7 @@ static void print_bug_type(void) 
 * modifying the code. @failed should be one of either:

 * EFAULT - if the problem happens on reading the @ip address

 * EINVAL - if what is read at @ip is not what was expected

 * EPERM - if the problem happens on writting to the @ip address

 * EPERM - if the problem happens on writing to the @ip address

 */

void ftrace_bug(int failed, struct dyn_ftrace *rec)

{
@@ -2391,7 +2391,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) 
		return ftrace_modify_call(rec, ftrace_old_addr, ftrace_addr);

	}



	return -1; /* unknow ftrace bug */

	return -1; /* unknown ftrace bug */

}



void __weak ftrace_replace_code(int mod_flags)
@@ -3004,7 +3004,7 @@ ftrace_allocate_pages(unsigned long num_to_init) 
	int cnt;



	if (!num_to_init)

		return 0;

		return NULL;



	start_pg = pg = kzalloc(sizeof(*pg), GFP_KERNEL);

	if (!pg)
@@ -4755,7 +4755,7 @@ static int 
ftrace_set_addr(struct ftrace_ops *ops, unsigned long ip, int remove,

		int reset, int enable)

{

	return ftrace_set_hash(ops, 0, 0, ip, remove, reset, enable);

	return ftrace_set_hash(ops, NULL, 0, ip, remove, reset, enable);

}



/**
@@ -5463,7 +5463,7 @@ void ftrace_create_filter_files(struct ftrace_ops *ops, 


/*

 * The name "destroy_filter_files" is really a misnomer. Although

 * in the future, it may actualy delete the files, but this is

 * in the future, it may actually delete the files, but this is

 * really intended to make sure the ops passed in are disabled

 * and that when this function returns, the caller is free to

 * free the ops.
@@ -5786,7 +5786,7 @@ void ftrace_module_enable(struct module *mod) 
	/*

	 * If the tracing is enabled, go ahead and enable the record.

	 *

	 * The reason not to enable the record immediatelly is the

	 * The reason not to enable the record immediately is the

	 * inherent check of ftrace_make_nop/ftrace_make_call for

	 * correct previous instructions.  Making first the NOP

	 * conversion puts the module to the correct state, thus

kernel/trace/trace_dynevent.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type) 
static int create_dyn_event(int argc, char **argv)

{

	struct dyn_event_operations *ops;

	int ret;

	int ret = -ENODEV;



	if (argv[0][0] == '-' || argv[0][0] == '!')

		return dyn_event_release(argc, argv, NULL);

kernel/trace/trace_events_hist.c

+0 −1
Original line number Diff line number Diff line
@@ -3713,7 +3713,6 @@ static void track_data_destroy(struct hist_trigger_data *hist_data, 
	struct trace_event_file *file = hist_data->event_file;



	destroy_hist_field(data->track_data.track_var, 0);

	destroy_hist_field(data->track_data.var_ref, 0);



	if (data->action == ACTION_SNAPSHOT) {

		struct track_data *track_data;