diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-12-04 22:48:30 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-12-04 22:48:30 +0100 |
| commit | fc284d631894d8673d229fad92762b66c9875cab (patch) | |
| tree | 7b530667b9f7c5c4899c024abda518283abf80b4 /arch/alpha/kernel/module.c | |
| parent | 444f9e99a840c4050c0530cfef81801a21a59f4c (diff) | |
| parent | e0224418516b4d8a6c2160574bac18447c354ef0 (diff) | |
| download | kernel_replicant_linux-fc284d631894d8673d229fad92762b66c9875cab.tar.gz kernel_replicant_linux-fc284d631894d8673d229fad92762b66c9875cab.tar.bz2 kernel_replicant_linux-fc284d631894d8673d229fad92762b66c9875cab.zip | |
Merge branch 'from-rusty/modules-next' into for-4.5/core
As agreed with Rusty, we're taking a current module-next pile through
livepatching.git, as it contains solely patches that are pre-requisity
for module page protection cleanups in livepatching. Rusty will be
restarting module-next from scratch.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch/alpha/kernel/module.c')
| -rw-r--r-- | arch/alpha/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c index 2fd00b7077e4..936bc8f89a67 100644 --- a/arch/alpha/kernel/module.c +++ b/arch/alpha/kernel/module.c @@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab, /* The small sections were sorted to the end of the segment. The following should definitely cover them. */ - gp = (u64)me->module_core + me->core_size - 0x8000; + gp = (u64)me->core_layout.base + me->core_layout.size - 0x8000; got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { |