[XTENSA] Fix modules for non-exec processor configurations

czankel · czankel · commit 3b4a49e21b0d · 2008-02-13T17:23:26.000-08:00
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 &lt;chris@zankel.net&gt;
diff --git 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
@@ -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
@@ -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):

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ void *module_alloc(unsigned long size)`
`28`	`28`	`{`
`29`	`29`	`if (size == 0)`
`30`	`30`	`return NULL;`
`31`		`- return vmalloc(size);`
	`31`	`+ return vmalloc_exec(size);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`void module_free(struct module mod, void module_region)`