From: Ralf Baechle <ralf@mips.com>
Date: Wed, 20 Jun 2007 13:25:27 +0000 (+0100)
Subject: [MIPS] SMTC and non-SMTC kernel and modules are incompatible
X-Git-Tag: v2.6.22-rc7~47^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2fae3731b1b02316c219c4556bb7ad3a920f73cc;p=linux-2.6-omap-h63xx.git

[MIPS] SMTC and non-SMTC kernel and modules are incompatible

So don't allow mixing.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/include/asm-mips/module.h b/include/asm-mips/module.h
index 399d03f1c4f..c5ef324fd69 100644
--- a/include/asm-mips/module.h
+++ b/include/asm-mips/module.h
@@ -122,6 +122,13 @@ search_module_dbetables(unsigned long addr)
 #define MODULE_KERNEL_TYPE "64BIT "
 #endif
 
-#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_KERNEL_TYPE
+#ifdef CONFIG_MIPS_MT_SMTC
+#define MODULE_KERNEL_SMTC "MT_SMTC "
+#else
+#define MODULE_KERNEL_SMTC ""
+#endif
+
+#define MODULE_ARCH_VERMAGIC \
+	MODULE_PROC_FAMILY MODULE_KERNEL_TYPE MODULE_KERNEL_SMTC
 
 #endif /* _ASM_MODULE_H */