summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorJoshua Kinard <kumba@gentoo.org>2012-12-27 18:46:46 +0000
committerRalf Baechle <ralf@linux-mips.org>2013-01-03 00:03:08 +0100
commit2f12fb20dee7285d8e9b8c1f703c0c1604b2c22e (patch)
tree7a59dcaea0b472fecfe573b330b1854016bd7b69 /arch/mips
parent6295150b732085989e170d2034b84b6ddff6c19e (diff)
downloadlinux-3.10-2f12fb20dee7285d8e9b8c1f703c0c1604b2c22e.tar.gz
linux-3.10-2f12fb20dee7285d8e9b8c1f703c0c1604b2c22e.tar.bz2
linux-3.10-2f12fb20dee7285d8e9b8c1f703c0c1604b2c22e.zip
MIPS: 64-bit: Fix build if !CONFIG_MODULES
Fix build failure if building a monolithic kernel due to arch/mips/kernel/Kconfig selecting MODULES_USE_ELF_REL[A] without checking to see if MODULES is set or not. This leads to 'struct module' not existing, which triggers a compile failure in arch/mips/kernel/module-rela.c when the compiler attempts to dereference me->name: CC arch/mips/kernel/module-rela.o arch/mips/kernel/module-rela.c: In function ‘apply_r_mips_26_rela’: arch/mips/kernel/module-rela.c:38:74: error: dereferencing pointer to incomplete type arch/mips/kernel/module-rela.c:46:12: error: dereferencing pointer to incomplete type arch/mips/kernel/module-rela.c: In function ‘apply_relocate_add’: arch/mips/kernel/module-rela.c:133:13: error: dereferencing pointer to incomplete type make[2]: *** [arch/mips/kernel/module-rela.o] Error 1 Signed-off-by: Joshua Kinard <kumba@gentoo.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/4749/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b7dc39c6c84..2ac626ab9d4 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -39,8 +39,8 @@ config MIPS
select GENERIC_CLOCKEVENTS
select GENERIC_CMOS_UPDATE
select HAVE_MOD_ARCH_SPECIFIC
- select MODULES_USE_ELF_REL
- select MODULES_USE_ELF_RELA if 64BIT
+ select MODULES_USE_ELF_REL if MODULES
+ select MODULES_USE_ELF_RELA if MODULES && 64BIT
menu "Machine selection"