---

yaml --- r: 377245 b: refs/heads/master c: 53d5def h: refs/heads/master i: 377243: aed6311 v: v3
git-mirror · Jun 20, 2013 · f412c11 · f412c11
1 parent e68e62b
commit f412c11
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bbd9f04b7d982d1c6aeb5c08f5983b3d0b9e2fe
+refs/heads/master: 53d5defcfa8c9603554a3174cbe206fb69f6e8ef
diff --git a/trunk/arch/arm64/kernel/perf_event.c b/trunk/arch/arm64/kernel/perf_event.c
@@ -1336,6 +1336,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry,
 		return;
 	}
 
+	perf_callchain_store(entry, regs->pc);
 	tail = (struct frame_tail __user *)regs->regs[29];
 
 	while (entry->nr < PERF_MAX_STACK_DEPTH &&

diff --git a/trunk/arch/tile/lib/exports.c b/trunk/arch/tile/lib/exports.c
@@ -84,4 +84,6 @@ uint64_t __ashrdi3(uint64_t, unsigned int);
 EXPORT_SYMBOL(__ashrdi3);
 uint64_t __ashldi3(uint64_t, unsigned int);
 EXPORT_SYMBOL(__ashldi3);
+int __ffsdi2(uint64_t);
+EXPORT_SYMBOL(__ffsdi2);
 #endif
-Original file line number
+Diff line change
@@ Expand Up @@
     		return;
     	}
+    	perf_callchain_store(entry, regs->pc);
     	tail = (struct frame_tail __user *)regs->regs[29];
     	while (entry->nr < PERF_MAX_STACK_DEPTH &&
@@ Expand Down @@