git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
module.c
diff --git
a/arch/alpha/kernel/module.c
b/arch/alpha/kernel/module.c
index
fc271e3
..
aac6d4b
100644
(file)
--- a/
arch/alpha/kernel/module.c
+++ b/
arch/alpha/kernel/module.c
@@
-47,7
+47,7
@@
module_free(struct module *mod, void *module_region)
struct got_entry {
struct got_entry *next;
struct got_entry {
struct got_entry *next;
- Elf64_
Addr r_offset
;
+ Elf64_
Sxword r_addend
;
int got_offset;
};
int got_offset;
};
@@
-57,14
+57,14
@@
process_reloc_for_got(Elf64_Rela *rela,
{
unsigned long r_sym = ELF64_R_SYM (rela->r_info);
unsigned long r_type = ELF64_R_TYPE (rela->r_info);
{
unsigned long r_sym = ELF64_R_SYM (rela->r_info);
unsigned long r_type = ELF64_R_TYPE (rela->r_info);
- Elf64_
Addr r_offset = rela->r_offset
;
+ Elf64_
Sxword r_addend = rela->r_addend
;
struct got_entry *g;
if (r_type != R_ALPHA_LITERAL)
return;
for (g = chains + r_sym; g ; g = g->next)
struct got_entry *g;
if (r_type != R_ALPHA_LITERAL)
return;
for (g = chains + r_sym; g ; g = g->next)
- if (g->r_
offset == r_offset
) {
+ if (g->r_
addend == r_addend
) {
if (g->got_offset == 0) {
g->got_offset = *poffset;
*poffset += 8;
if (g->got_offset == 0) {
g->got_offset = *poffset;
*poffset += 8;
@@
-74,7
+74,7
@@
process_reloc_for_got(Elf64_Rela *rela,
g = kmalloc (sizeof (*g), GFP_KERNEL);
g->next = chains[r_sym].next;
g = kmalloc (sizeof (*g), GFP_KERNEL);
g->next = chains[r_sym].next;
- g->r_
offset = r_offset
;
+ g->r_
addend = r_addend
;
g->got_offset = *poffset;
*poffset += 8;
chains[r_sym].next = g;
g->got_offset = *poffset;
*poffset += 8;
chains[r_sym].next = g;