diff options
-rw-r--r-- | arch/xtensa/kernel/module.c | 2 | ||||
-rw-r--r-- | include/asm-xtensa/module.h | 4 | ||||
-rw-r--r-- | include/asm-xtensa/pgtable.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c index ddf14dcf2ad9..3981a466c779 100644 --- a/arch/xtensa/kernel/module.c +++ b/arch/xtensa/kernel/module.c | |||
@@ -28,7 +28,7 @@ void *module_alloc(unsigned long size) | |||
28 | { | 28 | { |
29 | if (size == 0) | 29 | if (size == 0) |
30 | return NULL; | 30 | return NULL; |
31 | return vmalloc(size); | 31 | return vmalloc_exec(size); |
32 | } | 32 | } |
33 | 33 | ||
34 | void module_free(struct module *mod, void *module_region) | 34 | void module_free(struct module *mod, void *module_region) |
diff --git a/include/asm-xtensa/module.h b/include/asm-xtensa/module.h index ffb25bfdf6a1..d9b34bee4d42 100644 --- a/include/asm-xtensa/module.h +++ b/include/asm-xtensa/module.h | |||
@@ -15,9 +15,11 @@ | |||
15 | 15 | ||
16 | struct mod_arch_specific | 16 | struct mod_arch_specific |
17 | { | 17 | { |
18 | /* Module support is not completely implemented. */ | 18 | /* No special elements, yet. */ |
19 | }; | 19 | }; |
20 | 20 | ||
21 | #define MODULE_ARCH_VERMAGIC "xtensa-" __stringify(XCHAL_CORE_ID) " " | ||
22 | |||
21 | #define Elf_Shdr Elf32_Shdr | 23 | #define Elf_Shdr Elf32_Shdr |
22 | #define Elf_Sym Elf32_Sym | 24 | #define Elf_Sym Elf32_Sym |
23 | #define Elf_Ehdr Elf32_Ehdr | 25 | #define Elf_Ehdr Elf32_Ehdr |
diff --git a/include/asm-xtensa/pgtable.h b/include/asm-xtensa/pgtable.h index c0fcc1c9660c..c8b024a48b4d 100644 --- a/include/asm-xtensa/pgtable.h +++ b/include/asm-xtensa/pgtable.h | |||
@@ -66,11 +66,9 @@ | |||
66 | */ | 66 | */ |
67 | 67 | ||
68 | #define VMALLOC_START 0xC0000000 | 68 | #define VMALLOC_START 0xC0000000 |
69 | #define VMALLOC_END 0xC6FEFFFF | 69 | #define VMALLOC_END 0xC7FEFFFF |
70 | #define TLBTEMP_BASE_1 0xC6FF0000 | 70 | #define TLBTEMP_BASE_1 0xC7FF0000 |
71 | #define TLBTEMP_BASE_2 0xC6FF8000 | 71 | #define TLBTEMP_BASE_2 0xC7FF8000 |
72 | #define MODULE_START 0xC7000000 | ||
73 | #define MODULE_END 0xC7FFFFFF | ||
74 | 72 | ||
75 | /* | 73 | /* |
76 | * Xtensa Linux config PTE layout (when present): | 74 | * Xtensa Linux config PTE layout (when present): |