---

yaml
---
r: 210542
b: refs/heads/master
c: df09162
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1d4e08d1fa302f877d9a26d8ce056734b46ca14
+refs/heads/master: df09162550fbb53354f0c88e85b5d0e6129ee9cc

trunk/kernel/trace/ftrace.c

@@ -1510,6 +1510,8 @@ static void *t_start(struct seq_file *m, loff_t *pos)
 		if (*pos > 0)
 			return t_hash_start(m, pos);
 		iter->flags |= FTRACE_ITER_PRINTALL;
+		/* reset in case of seek/pread */
+		iter->flags &= ~FTRACE_ITER_HASH;
 		return iter;
 	}
 

trunk/tools/perf/util/symbol.c

@@ -2268,9 +2268,6 @@ static int setup_list(struct strlist **list, const char *list_str,
 
 int symbol__init(void)
 {
-	if (symbol_conf.initialized)
-		return 0;
-
 	elf_version(EV_CURRENT);
 	if (symbol_conf.sort_by_name)
 		symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -
@@ -2296,7 +2293,6 @@ int symbol__init(void)
 		       symbol_conf.sym_list_str, "symbol") < 0)
 		goto out_free_comm_list;
 
-	symbol_conf.initialized = true;
 	return 0;
 
 out_free_dso_list:
@@ -2308,14 +2304,11 @@ int symbol__init(void)
 
 void symbol__exit(void)
 {
-	if (!symbol_conf.initialized)
-		return;
 	strlist__delete(symbol_conf.sym_list);
 	strlist__delete(symbol_conf.dso_list);
 	strlist__delete(symbol_conf.comm_list);
 	vmlinux_path__exit();
 	symbol_conf.sym_list = symbol_conf.dso_list = symbol_conf.comm_list = NULL;
-	symbol_conf.initialized = false;
 }
 
 int machines__create_kernel_maps(struct rb_root *self, pid_t pid)

trunk/tools/perf/util/symbol.h

@@ -69,8 +69,7 @@ struct symbol_conf {
 			show_nr_samples,
 			use_callchain,
 			exclude_other,
-			show_cpu_utilization,
-			initialized;
+			show_cpu_utilization;
 	const char	*vmlinux_name,
 			*source_prefix,
 			*field_sep;