From: Zachary Amsden <zach@vmware.com>
To: Linus Torvalds <torvalds@osdl.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Virtualization Mailing List <virtualization@lists.osdl.org>,
Xen-devel <xen-devel@lists.xensource.com>,
Andrew Morton <akpm@osdl.org>, Zachary Amsden <zach@vmware.com>,
Dan Hecht <dhecht@vmware.com>, Dan Arai <arai@vmware.com>,
Anne Holler <anne@vmware.com>,
Pratap Subrahmanyam <pratap@vmware.com>,
Christopher Li <chrisl@vmware.com>,
Joshua LeVasseur <jtl@ira.uka.de>, Chris Wright <chrisw@osdl.org>,
Rik Van Riel <riel@redhat.com>, Jyothy Reddy <jreddy@vmware.com>,
Jack Lo <jlo@vmware.com>, Kip Macy <kmacy@fsmware.com>,
Jan Beulich <jbeulich@novell.com>,
Ky Srinivasan <ksrinivasan@novell.com>,
Wim Coekaerts <wim.coekaerts@oracle.com>,
Leendert van Doorn <leendert@watson.ibm.com>,
Zachary Amsden <zach@vmware.com>
Subject: [RFC, PATCH 20/24] i386 Vmi module fixups
Date: Mon, 13 Mar 2006 10:14:37 -0800 [thread overview]
Message-ID: <200603131814.k2DIEbpA005766@zach-dev.vmware.com> (raw)
Add a sub-arch specifier to the module identification string to avoid
cross loading modules from different subarch compiles.
XXX FIXME. Module loading is broken in paravirtualized VMI kernels,
since there is no annotation fixup applied to modules.
Signed-off-by: Zachary Amsden <zach@vmware.com>
Index: linux-2.6.16-rc3/include/asm-i386/module.h
===================================================================
--- linux-2.6.16-rc3.orig/include/asm-i386/module.h 2006-02-24 16:00:21.000000000 -0800
+++ linux-2.6.16-rc3/include/asm-i386/module.h 2006-02-24 16:02:02.000000000 -0800
@@ -1,6 +1,8 @@
#ifndef _ASM_I386_MODULE_H
#define _ASM_I386_MODULE_H
+#include <mach_module.h>
+
/* x86 is simple */
struct mod_arch_specific
{
@@ -72,6 +74,7 @@ struct mod_arch_specific
#define MODULE_STACKSIZE ""
#endif
-#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_REGPARM MODULE_STACKSIZE
+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_REGPARM MODULE_STACKSIZE \
+ MODULE_SUBARCH_VERMAGIC
#endif /* _ASM_I386_MODULE_H */
Index: linux-2.6.16-rc3/include/asm-i386/mach-vmi/mach_module.h
===================================================================
--- linux-2.6.16-rc3.orig/include/asm-i386/mach-vmi/mach_module.h 2006-02-24 16:02:02.000000000 -0800
+++ linux-2.6.16-rc3/include/asm-i386/mach-vmi/mach_module.h 2006-02-24 16:02:02.000000000 -0800
@@ -0,0 +1,6 @@
+#ifndef _ASM_I386_ARCH_MODULE_H
+#define _ASM_I386_ARCH_MODULE_H
+
+#define MODULE_SUBARCH_VERMAGIC "VMI "
+
+#endif /* _ASM_I386_ARCH_MODULE_H */
Index: linux-2.6.16-rc3/include/asm-i386/mach-default/mach_module.h
===================================================================
--- linux-2.6.16-rc3.orig/include/asm-i386/mach-default/mach_module.h 2006-02-24 16:02:02.000000000 -0800
+++ linux-2.6.16-rc3/include/asm-i386/mach-default/mach_module.h 2006-02-24 16:02:02.000000000 -0800
@@ -0,0 +1,6 @@
+#ifndef _ASM_I386_ARCH_MODULE_H
+#define _ASM_I386_ARCH_MODULE_H
+
+#define MODULE_SUBARCH_VERMAGIC
+
+#endif /* _ASM_I386_ARCH_MODULE_H */
reply other threads:[~2006-03-13 18:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200603131814.k2DIEbpA005766@zach-dev.vmware.com \
--to=zach@vmware.com \
--cc=akpm@osdl.org \
--cc=anne@vmware.com \
--cc=arai@vmware.com \
--cc=chrisl@vmware.com \
--cc=chrisw@osdl.org \
--cc=dhecht@vmware.com \
--cc=jbeulich@novell.com \
--cc=jlo@vmware.com \
--cc=jreddy@vmware.com \
--cc=jtl@ira.uka.de \
--cc=kmacy@fsmware.com \
--cc=ksrinivasan@novell.com \
--cc=leendert@watson.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pratap@vmware.com \
--cc=riel@redhat.com \
--cc=torvalds@osdl.org \
--cc=virtualization@lists.osdl.org \
--cc=wim.coekaerts@oracle.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome