Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-01-06 22:54:18 -05:00
parent c7f5d10549 51cb67c0b0
commit 9e0efaf6b4
32 changed files with 173 additions and 134 deletions
--- a/kernel/trace/trace_printk.c
+++ b/kernel/trace/trace_printk.c
@@ -273,6 +273,7 @@ static const char **find_next(void *v, loff_t *pos)
 	if (*pos < last_index + start_index)
 		return __start___tracepoint_str + (*pos - last_index);

+	start_index += last_index;
 	return find_next_mod_format(start_index, v, fmt, pos);
 }