git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[pandora-kernel.git]
/
arch
/
sparc64
/
kernel
/
module.c
diff --git
a/arch/sparc64/kernel/module.c
b/arch/sparc64/kernel/module.c
index
6c83e37
..
158484b
100644
(file)
--- a/
arch/sparc64/kernel/module.c
+++ b/
arch/sparc64/kernel/module.c
@@
-11,7
+11,6
@@
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/slab.h>
-#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <asm/processor.h>
#include <linux/mm.h>
#include <asm/processor.h>
@@
-143,6
+142,11
@@
int apply_relocate_add(Elf64_Shdr *sechdrs,
location[3] = v >> 0;
break;
location[3] = v >> 0;
break;
+ case R_SPARC_DISP32:
+ v -= (Elf64_Addr) location;
+ *loc32 = v;
+ break;
+
case R_SPARC_WDISP30:
v -= (Elf64_Addr) location;
*loc32 = (*loc32 & ~0x3fffffff) |
case R_SPARC_WDISP30:
v -= (Elf64_Addr) location;
*loc32 = (*loc32 & ~0x3fffffff) |