From f412c11c8f7cee437917ca69c3b75394cb76a1e3 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 20 Jun 2013 08:08:46 -1000 Subject: [PATCH] --- yaml --- r: 377245 b: refs/heads/master c: 53d5defcfa8c9603554a3174cbe206fb69f6e8ef h: refs/heads/master i: 377243: aed6311efaebd22a85f5336f5b53d83f0606a0aa v: v3 --- [refs] | 2 +- trunk/arch/arm64/kernel/perf_event.c | 1 + trunk/arch/tile/lib/exports.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e74e62debc79..72d028f6f3c4 100644 --- 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 index 1e49e5eb81e9..9ba33c40cdf8 100644 --- 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 index 4385cb6fa00a..a93b02a25222 100644 --- 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