summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorHendrik Brueckner <brueckner@linux.vnet.ibm.com>2012-10-31 17:26:44 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-02-14 15:55:26 +0100
commite80cfc31d872b6b85b8966bce6ba80bee401a7dd (patch)
tree11991f8c0688a86f7b39b6473845035b912dfe40 /arch/s390/kernel
parent29bde2d93289d86d5caf24e75c14559292a42756 (diff)
downloadtalos-obmc-linux-e80cfc31d872b6b85b8966bce6ba80bee401a7dd.tar.gz
talos-obmc-linux-e80cfc31d872b6b85b8966bce6ba80bee401a7dd.zip
s390/module: Add missing R_390_NONE relocation type
Allow loading of kernel modules that have relocations of type R_390_NONE. Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/module.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index 06f17311628a..f750bd7bd2c2 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -234,6 +234,9 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
val = symtab[r_sym].st_value;
switch (r_type) {
+ case R_390_NONE: /* No relocation. */
+ rc = 0;
+ break;
case R_390_8: /* Direct 8 bit. */
case R_390_12: /* Direct 12 bit. */
case R_390_16: /* Direct 16 bit. */
OpenPOWER on IntegriCloud