diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 22:00:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 22:00:52 -0400 |
| commit | 45f6bc5ff9c3387387f048ec85dcb4e69acf0b03 (patch) | |
| tree | d04952bb05b53a362bcd165fb910c5c1441b4c5d /arch/avr32/kernel/module.c | |
| parent | 3138887bd8d18173f3c2baf1e43621c49090cd27 (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into usb-next
We want these fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/avr32/kernel/module.c')
| -rw-r--r-- | arch/avr32/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/kernel/module.c b/arch/avr32/kernel/module.c index 596f7305d93f..2c9412908024 100644 --- a/arch/avr32/kernel/module.c +++ b/arch/avr32/kernel/module.c | |||
| @@ -264,7 +264,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, | |||
| 264 | break; | 264 | break; |
| 265 | case R_AVR32_GOT18SW: | 265 | case R_AVR32_GOT18SW: |
| 266 | if ((relocation & 0xfffe0003) != 0 | 266 | if ((relocation & 0xfffe0003) != 0 |
| 267 | && (relocation & 0xfffc0003) != 0xffff0000) | 267 | && (relocation & 0xfffc0000) != 0xfffc0000) |
| 268 | return reloc_overflow(module, "R_AVR32_GOT18SW", | 268 | return reloc_overflow(module, "R_AVR32_GOT18SW", |
| 269 | relocation); | 269 | relocation); |
| 270 | relocation >>= 2; | 270 | relocation >>= 2; |
