diff --git a/[refs] b/[refs]
index 71953aa4e41b..7b75443da9a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a58730c42174672fe0012a4edbe3e38f94ef2bad
+refs/heads/master: ea01e798e2d27fd04142e0473ca36570fa9d9218
diff --git a/trunk/include/linux/module.h b/trunk/include/linux/module.h
index a29c2ebb7c38..3e03b1acbc94 100644
--- a/trunk/include/linux/module.h
+++ b/trunk/include/linux/module.h
@@ -190,7 +190,7 @@ void *__symbol_get_gpl(const char *symbol);
 	extern typeof(sym) sym;					\
 	__CRC_SYMBOL(sym, sec)					\
 	static const char __kstrtab_##sym[]			\
-	__attribute__((section("__ksymtab_strings")))		\
+	__attribute__((section("__ksymtab_strings"), aligned(1))) \
 	= MODULE_SYMBOL_PREFIX #sym;                    	\
 	static const struct kernel_symbol __ksymtab_##sym	\
 	__used							\
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index b0d7c2a41bd9..031bf26af8ea 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -1828,8 +1828,9 @@ static struct module *load_module(void __user *umod,
 	unwindex = find_sec(hdr, sechdrs, secstrings, ARCH_UNWIND_SECTION_NAME);
 #endif
 
-	/* Don't keep modinfo section */
+	/* Don't keep modinfo and version sections. */
 	sechdrs[infoindex].sh_flags &= ~(unsigned long)SHF_ALLOC;
+	sechdrs[versindex].sh_flags &= ~(unsigned long)SHF_ALLOC;
 #ifdef CONFIG_KALLSYMS
 	/* Keep symbol and string tables for decoding later. */
 	sechdrs[symindex].sh_flags |= SHF_ALLOC;