diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:48:13 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:49:06 -0500 |
commit | 85910c202bb869edd2bb9a6c217a658c83f06f1e (patch) | |
tree | fcf4bf1ba2ebfcb6dec395a10ed6b33e7d33217e /arch/tile/Makefile | |
parent | f7200d4c504a385b1b70f3bab379f99745f7ef6a (diff) | |
parent | 517ffce4e1a03aea979fe3a18a3dd1761a24fafb (diff) | |
download | blackbird-op-linux-85910c202bb869edd2bb9a6c217a658c83f06f1e.tar.gz blackbird-op-linux-85910c202bb869edd2bb9a6c217a658c83f06f1e.zip |
Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc
Backmerge from the point in mainline where a trivial conflict had been
introduced (arch/sparc/kernel/sys_sparc_64.c had grown sys_kern_features()
right after where kernel_execve() used to be)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/tile/Makefile')
-rw-r--r-- | arch/tile/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/tile/Makefile b/arch/tile/Makefile index 55640cf92597..3d15364c6071 100644 --- a/arch/tile/Makefile +++ b/arch/tile/Makefile @@ -26,6 +26,10 @@ $(error Set TILERA_ROOT or CROSS_COMPILE when building $(ARCH) on $(HOST_ARCH)) endif endif +# The tile compiler may emit .eh_frame information for backtracing. +# In kernel modules, this causes load failures due to unsupported relocations. +KBUILD_CFLAGS += -fno-asynchronous-unwind-tables + ifneq ($(CONFIG_DEBUG_EXTRA_FLAGS),"") KBUILD_CFLAGS += $(CONFIG_DEBUG_EXTRA_FLAGS) endif |