diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 15:26:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 15:26:29 -0700 |
| commit | faa88df860fdfad13afc99fc7201432f9263b3b5 (patch) | |
| tree | 0c5b480922c4a2d65154f610ae04928790de96da /arch/sparc/kernel/module.c | |
| parent | 1b52fa98edd1c3e663ea4a06519e3d20976084a8 (diff) | |
| parent | 586152560ae8df2a9babf1a8b667d7a145cb8208 (diff) | |
| download | kernel_samsung_smdk4412-faa88df860fdfad13afc99fc7201432f9263b3b5.zip kernel_samsung_smdk4412-faa88df860fdfad13afc99fc7201432f9263b3b5.tar.gz kernel_samsung_smdk4412-faa88df860fdfad13afc99fc7201432f9263b3b5.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix warning on prom_getproperty in openprom.c
[SPARC]: Handle UNWIND_INFO properly.
[SPARC64]: Update defconfig.
[SPARC]: show device name in /proc/dvma_map
[SPARC]: Remove duplicate symbol exports
Diffstat (limited to 'arch/sparc/kernel/module.c')
| -rw-r--r-- | arch/sparc/kernel/module.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c index 787d5f1..598682f 100644 --- a/arch/sparc/kernel/module.c +++ b/arch/sparc/kernel/module.c @@ -113,6 +113,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, switch (ELF32_R_TYPE(rel[i].r_info)) { case R_SPARC_32: + case R_SPARC_UA32: location[0] = v >> 24; location[1] = v >> 16; location[2] = v >> 8; |