From a9635ce3df26d5ec721535aaeb13aae3828a147d Mon Sep 17 00:00:00 2001 From: Hendrik Brueckner Date: Wed, 31 Oct 2012 17:26:44 +0100 Subject: [PATCH] --- yaml --- r: 356141 b: refs/heads/master c: e80cfc31d872b6b85b8966bce6ba80bee401a7dd h: refs/heads/master i: 356139: 95dff64f8aeb765f03494f9fc748b9003bda5ee8 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/module.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1f16f1bdf352..746997f637b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29bde2d93289d86d5caf24e75c14559292a42756 +refs/heads/master: e80cfc31d872b6b85b8966bce6ba80bee401a7dd diff --git a/trunk/arch/s390/kernel/module.c b/trunk/arch/s390/kernel/module.c index 06f17311628a..f750bd7bd2c2 100644 --- a/trunk/arch/s390/kernel/module.c +++ b/trunk/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. */