diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 18:06:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 18:06:57 -0700 |
| commit | 101b82f56d50a445bb5281f834c86e106732070f (patch) | |
| tree | 951e204487494557ca0f231e7fd8457bc58dddd2 /arch/avr32/kernel/module.c | |
| parent | 3cb7a59fd8c816af6765f3712cd233d83984edf2 (diff) | |
| parent | 0c9b5a317b8ae7201fed07ec66d642b2ad7ea1b0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 update from Hans-Christian Egtvedt:
"wow, it has gone 10 releases since my last request :("
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: fix building warnings caused by redefinitions of HZ
avr32: fix relocation check for signed 18-bit offset
avr32: move NODES_SHIFT into Kconfig and delete numnodes.h
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, break; case R_AVR32_GOT18SW: if ((relocation & 0xfffe0003) != 0 - && (relocation & 0xfffc0003) != 0xffff0000) + && (relocation & 0xfffc0000) != 0xfffc0000) return reloc_overflow(module, "R_AVR32_GOT18SW", relocation); relocation >>= 2; |