[XTENSA] Fix modules for non-exec processor configurations

We need to use vmalloc_exec for module loading. Also remove
the definitions MODULE_START and MODULE_END, which wasn't
used, and increase the VMALLOC memory range accordingly.

Signed-off-by: Chris Zankel <chris@zankel.net>

diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c
index ddf14dcf2ad969d1bc2be814c9ee7f99c3c6d366..3981a466c779cfd57f8e4cd0033581d8dfc3edd4 100644 (file)
--- a/arch/xtensa/kernel/module.c
+++ b/arch/xtensa/kernel/module.c
@@ -28,7 +28,7 @@ void *module_alloc(unsigned long size)
 {
        if (size == 0)
                return NULL;
-       return vmalloc(size);
+       return vmalloc_exec(size);
 }
 
 void module_free(struct module *mod, void *module_region)

diff --git a/include/asm-xtensa/module.h b/include/asm-xtensa/module.h
index ffb25bfdf6a12e2118f6657e86cc7d673044e93e..d9b34bee4d4255955bb0fae7340eb135a43158c4 100644 (file)
--- a/include/asm-xtensa/module.h
+++ b/include/asm-xtensa/module.h
@@ -15,9 +15,11 @@
 
 struct mod_arch_specific
 {
-       /* Module support is not completely implemented. */
+       /* No special elements, yet. */
 };
 
+#define MODULE_ARCH_VERMAGIC "xtensa-" __stringify(XCHAL_CORE_ID) " "
+
 #define Elf_Shdr Elf32_Shdr
 #define Elf_Sym Elf32_Sym
 #define Elf_Ehdr Elf32_Ehdr

diff --git a/include/asm-xtensa/pgtable.h b/include/asm-xtensa/pgtable.h
index c0fcc1c9660c2ec1836a4b3d96f8e8d85aa63121..c8b024a48b4d15f2865e76f7a4babf6592191b4d 100644 (file)
--- a/include/asm-xtensa/pgtable.h
+++ b/include/asm-xtensa/pgtable.h
@@ -66,11 +66,9 @@
  */
 
 #define VMALLOC_START          0xC0000000
-#define VMALLOC_END            0xC6FEFFFF
-#define TLBTEMP_BASE_1         0xC6FF0000
-#define TLBTEMP_BASE_2         0xC6FF8000
-#define MODULE_START           0xC7000000
-#define MODULE_END             0xC7FFFFFF
+#define VMALLOC_END            0xC7FEFFFF
+#define TLBTEMP_BASE_1         0xC7FF0000
+#define TLBTEMP_BASE_2         0xC7FF8000
 
 /*
  * Xtensa Linux config PTE layout (when present):