From 78b8d2462f319457da88e1de87250d51b92b805a Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Mon, 7 Jan 2008 16:42:21 -0800
Subject: [PATCH] --- yaml --- r: 85936 b: refs/heads/master c:
 3b4a49e21b0d8a69629623815a8caff3eb4cf9f7 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/xtensa/kernel/module.c  | 2 +-
 trunk/include/asm-xtensa/module.h  | 4 +++-
 trunk/include/asm-xtensa/pgtable.h | 8 +++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index accc93e32645..67b248583010 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e92501a4e10e640786de10786c434834a0c1651
+refs/heads/master: 3b4a49e21b0d8a69629623815a8caff3eb4cf9f7
diff --git a/trunk/arch/xtensa/kernel/module.c b/trunk/arch/xtensa/kernel/module.c
index ddf14dcf2ad9..3981a466c779 100644
--- a/trunk/arch/xtensa/kernel/module.c
+++ b/trunk/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/trunk/include/asm-xtensa/module.h b/trunk/include/asm-xtensa/module.h
index ffb25bfdf6a1..d9b34bee4d42 100644
--- a/trunk/include/asm-xtensa/module.h
+++ b/trunk/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/trunk/include/asm-xtensa/pgtable.h b/trunk/include/asm-xtensa/pgtable.h
index c0fcc1c9660c..c8b024a48b4d 100644
--- a/trunk/include/asm-xtensa/pgtable.h
+++ b/trunk/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):