diff options
Diffstat (limited to 'arch/s390/kernel/module.c')
-rw-r--r-- | arch/s390/kernel/module.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c index 2ca95862e336..0c1a679314dd 100644 --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c | |||
@@ -38,13 +38,8 @@ | |||
38 | #define DEBUGP(fmt , ...) | 38 | #define DEBUGP(fmt , ...) |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #ifndef CONFIG_64BIT | ||
42 | #define PLT_ENTRY_SIZE 12 | ||
43 | #else /* CONFIG_64BIT */ | ||
44 | #define PLT_ENTRY_SIZE 20 | 41 | #define PLT_ENTRY_SIZE 20 |
45 | #endif /* CONFIG_64BIT */ | ||
46 | 42 | ||
47 | #ifdef CONFIG_64BIT | ||
48 | void *module_alloc(unsigned long size) | 43 | void *module_alloc(unsigned long size) |
49 | { | 44 | { |
50 | if (PAGE_ALIGN(size) > MODULES_LEN) | 45 | if (PAGE_ALIGN(size) > MODULES_LEN) |
@@ -53,7 +48,6 @@ void *module_alloc(unsigned long size) | |||
53 | GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE, | 48 | GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE, |
54 | __builtin_return_address(0)); | 49 | __builtin_return_address(0)); |
55 | } | 50 | } |
56 | #endif | ||
57 | 51 | ||
58 | void module_arch_freeing_init(struct module *mod) | 52 | void module_arch_freeing_init(struct module *mod) |
59 | { | 53 | { |
@@ -323,17 +317,11 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, | |||
323 | unsigned int *ip; | 317 | unsigned int *ip; |
324 | ip = me->module_core + me->arch.plt_offset + | 318 | ip = me->module_core + me->arch.plt_offset + |
325 | info->plt_offset; | 319 | info->plt_offset; |
326 | #ifndef CONFIG_64BIT | ||
327 | ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */ | ||
328 | ip[1] = 0x100607f1; | ||
329 | ip[2] = val; | ||
330 | #else /* CONFIG_64BIT */ | ||
331 | ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */ | 320 | ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */ |
332 | ip[1] = 0x100a0004; | 321 | ip[1] = 0x100a0004; |
333 | ip[2] = 0x07f10000; | 322 | ip[2] = 0x07f10000; |
334 | ip[3] = (unsigned int) (val >> 32); | 323 | ip[3] = (unsigned int) (val >> 32); |
335 | ip[4] = (unsigned int) val; | 324 | ip[4] = (unsigned int) val; |
336 | #endif /* CONFIG_64BIT */ | ||
337 | info->plt_initialized = 1; | 325 | info->plt_initialized = 1; |
338 | } | 326 | } |
339 | if (r_type == R_390_PLTOFF16 || | 327 | if (r_type == R_390_PLTOFF16 || |