Re: [Xenomai-help] Xenomai-2.4.2 vs kernel-2.6.24 (i686)

[Jan Kiszka <jan.kiszka@domain.hid>]

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

Philippe Gerum wrote:
> Hubert Talbot wrote:
>> Hi,
>>
>> I try to build kernel 2.6.24 with adeos-ipipe-2.6.24-x86-2.0-03.patch
>> and I get this:
>>
>>   ...
>>   AR      arch/x86/lib/lib.a
>>   GEN     .version
>>   CHK     include/linux/compile.h
>>   UPD     include/linux/compile.h
>>   CC      init/version.o
>>   LD      init/built-in.o
>>   LD      .tmp_vmlinux1
>> arch/x86/kernel/built-in.o: In function `do_machine_check_vector':
>> ipipe.c:(.text+0x128de): undefined reference to `do_machine_check'
>> make[1]: *** [.tmp_vmlinux1] Erreur 1
>> make[1]: quittant le répertoire * /usr/src/linux-2.6.24 *
>> make: *** [debian/stamp-build-kernel] Erreur 2
>>
> 
> It's a 64bit symbol only it seems. Disable CONFIG_X86_MCE for now, will
> fix. Thanks.

Here is some fix for this:

---
 arch/x86/kernel/ipipe.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: b/arch/x86/kernel/ipipe.c
===================================================================
--- a/arch/x86/kernel/ipipe.c
+++ b/arch/x86/kernel/ipipe.c
@@ -644,8 +644,13 @@ asmlinkage int __ipipe_syscall_root(stru
 static void do_machine_check_vector(struct pt_regs *regs, long error_code)
 {
 #ifdef CONFIG_X86_MCE
+#ifdef CONFIG_X86_32
+	extern void (*machine_check_vector)(struct pt_regs *, long error_code);
+	machine_check_vector(regs, error_code);
+#else  /* !CONFIG_X86_32 */
 	void do_machine_check(struct pt_regs *, long);
-	do_machine_check(regs,error_code);
+	do_machine_check(regs, error_code);
+#endif /* !CONFIG_X86_32 */
 #endif /* CONFIG_X86_MCE */
 }
 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 254 bytes --]