From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 23 May 2011 08:09:30 +0000 (+0900)
Subject: sh: Ignore R_SH_NONE module relocations.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=78207ffd0e00d39238f0a8a455a31a12659b30b3;p=linux-beck.git

sh: Ignore R_SH_NONE module relocations.

Some modules may end up with R_SH_NONE relocs with the right combination
of compiler/kernel config (specifically dwarf unwinder), so simply trap
and ignore them instead of letting them get down to the error path.

Reported-by: Carmelo AMOROSO <carmelo.amoroso@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c
index ae0be697a89e..19b1f8826aef 100644
--- a/arch/sh/kernel/module.c
+++ b/arch/sh/kernel/module.c
@@ -93,6 +93,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
 #endif
 
 		switch (ELF32_R_TYPE(rel[i].r_info)) {
+		case R_SH_NONE:
+			break;
 		case R_SH_DIR32:
 			value = get_unaligned(location);
 			value += relocation;