* linux-next: manual merge of the llvmlinux tree with the arm tree
@ 2014-09-26 9:21 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-09-26 9:21 UTC (permalink / raw)
To: Behan Webster, llvmlinux, Russell King
Cc: linux-next, linux-kernel, Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 1169 bytes --]
Hi all,
Today's linux-next merge of the llvmlinux tree got a conflict in
arch/arm/kernel/return_address.c between commit 95e750c0bac4 ("ARM:
8160/1: drop warning about return_address not using unwind tables")
from the arm tree and commit eeb5c3a69694 ("arm: LLVMLinux: use static
inline in ARM ftrace.h") from the llvmlinux tree (which also exists in
the arm tree).
I fixed it up (I took out the now empty #else clause ... see below) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/kernel/return_address.c
index 98ea4b7eb406,b7de88a40176..000000000000
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@@ -57,8 -56,12 +56,6 @@@ void *return_address(unsigned int level
return NULL;
}
--#else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
-
-#if defined(CONFIG_ARM_UNWIND)
-#warning "TODO: return_address should use unwind tables"
-#endif
--
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
EXPORT_SYMBOL_GPL(return_address);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-26 9:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-26 9:21 linux-next: manual merge of the llvmlinux tree with the arm tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).