From: Philippe Gerum <rpm@xenomai.org>
To: Jan Kiszka <jan.kiszka@domain.hid>
Cc: xenomai@xenomai.org
Subject: Re: [Xenomai-help] compile error xenomai 2.4.5
Date: Sat, 13 Sep 2008 12:31:23 +0200 [thread overview]
Message-ID: <48CB967B.3080203@domain.hid> (raw)
In-Reply-To: <48CB648F.2090509@domain.hid>
Jan Kiszka wrote:
> [ Don't start new topics by replying to unrelated ones! ]
>
> George Pitich wrote:
>> Tried to compile linux 2.6.26.5 kernel with xenomai 2.4.5 (also ran ./configure --disable-x86-tsc --enable-x86-sep)
>>
>> ./prepare-kernel.sh --arch=i386 --adeos=/usr/src/xenomai-2.4.5/ksrc/arch/x86/patches/adeos-ipipe-2.6.26-x86-2.0-09.patch --linux=/usr/src/linux-2.6.26.5
>>
>> make gave the error:
>>
>> arch/x86/xenomai/hal_32.c: In function ârthal_latency_above_maxâ:
>> arch/x86/xenomai/hal_32.c:139: error: implicit declaration of function âdie_nmiâ
>> make[1]: *** [arch/x86/xenomai/hal_32.o] Error 1
>> make: *** [arch/x86/xenomai] Error 2
>
> That's an issue of the 2.6.26 ipipe patch. Philippe, you dropped the
> nmi_32.h hunk:
>
No I didn't, but the die_nmi() prototype is now different between the 32 and 64bit
implementations; the i386 decl is missing. Here is the proper fix:
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
index 765a6d6..f0fc7c5 100644
--- a/include/asm-x86/nmi.h
+++ b/include/asm-x86/nmi.h
@@ -42,6 +42,7 @@ extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
extern void nmi_watchdog_default(void);
#else
#define nmi_watchdog_default() do {} while (0)
+extern void die_nmi(struct pt_regs *regs, const char *msg);
#endif
extern int check_nmi_watchdog(void);
> diff --git a/include/asm-x86/nmi_32.h b/include/asm-x86/nmi_32.h
> index 70a958a..da25e1c 100644
> --- a/include/asm-x86/nmi_32.h
> +++ b/include/asm-x86/nmi_32.h
> @@ -29,7 +29,8 @@ extern void setup_apic_nmi_watchdog (void *);
> extern void stop_apic_nmi_watchdog (void *);
> extern void disable_timer_nmi_watchdog(void);
> extern void enable_timer_nmi_watchdog(void);
> -extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);
> +extern int (*nmi_watchdog_tick)(struct pt_regs * regs, unsigned reason);
> +extern void die_nmi(struct pt_regs *, const char *msg);
>
> extern atomic_t nmi_active;
> extern unsigned int nmi_watchdog;
>
> Should be merged into the unified nmi.h now.
>
> George, in the meantime you can simply disable NMI watchdog support in
> Xenomai, and then the build should succeed again.
>
> Jan
>
--
Philippe.
next prev parent reply other threads:[~2008-09-13 10:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-12 17:54 [Xenomai-help] Xenomai for SH4 Pavel Bartusek
2008-09-12 19:20 ` [Xenomai-help] compile error xenomai 2.4.5 George Pitich
2008-09-13 6:58 ` Jan Kiszka
2008-09-13 10:31 ` Philippe Gerum [this message]
2008-09-13 6:59 ` [Xenomai-help] Xenomai for SH4 Jan Kiszka
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=48CB967B.3080203@domain.hid \
--to=rpm@xenomai.org \
--cc=jan.kiszka@domain.hid \
--cc=xenomai@xenomai.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.