---

yaml --- r: 121124 b: refs/heads/master c: 20e5227 h: refs/heads/master v: v3
git-mirror · Nov 16, 2008 · d58f640 · d58f640
1 parent 42a9cd3
commit d58f640
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31e889098a80ceb3e9e3c555d522b2686a6663c6
+refs/heads/master: 20e5227e9f55ae1969934821ccbf581563785bbe
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
@@ -1304,6 +1304,14 @@ static int ftrace_convert_nops(struct module *mod,
 	p = start;
 	while (p < end) {
 		addr = ftrace_call_adjust(*p++);
+		/*
+		 * Some architecture linkers will pad between
+		 * the different mcount_loc sections of different
+		 * object files to satisfy alignments.
+		 * Skip any NULL pointers.
+		 */
+		if (!addr)
+			continue;
 		ftrace_record_ip(addr);
 	}