Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a09cbce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull tile fixes from Chris Metcalf:
 "This fixes one issue with compiler flags that can cause modules not to
  load, and cleans up some warnings with ELF_R_xxx defines."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: avoid build warnings from duplicate ELF_R_xxx #defines
  arch/tile: avoid generating .eh_frame information in modules
parents 62472efe 78059633

arch/tile/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -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

arch/tile/kernel/module.c

+0 −10
Original line number Diff line number Diff line
@@ -24,16 +24,6 @@ 
#include <asm/homecache.h>

#include <arch/opcode.h>



#ifdef __tilegx__

# define Elf_Rela Elf64_Rela

# define ELF_R_SYM ELF64_R_SYM

# define ELF_R_TYPE ELF64_R_TYPE

#else

# define Elf_Rela Elf32_Rela

# define ELF_R_SYM ELF32_R_SYM

# define ELF_R_TYPE ELF32_R_TYPE

#endif



#ifdef MODULE_DEBUG

#define DEBUGP printk

#else