From: Jan Kiszka <jan.kiszka@domain.hid>
To: Philippe Gerum <rpm@xenomai.org>
Cc: xenomai-core <xenomai@xenomai.org>
Subject: [Xenomai-core] [PULL REQUEST] x86-hal: Include fix for NMI watchdog on 2.6.31
Date: Sat, 19 Sep 2009 13:30:09 +0200 [thread overview]
Message-ID: <4AB4C0C1.7000708@domain.hid> (raw)
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
The following changes since commit 280f42f0874d00b8ea0ca8b966e568604eec17f0:
Jan Kiszka (1):
rtipc: Fix 64-bit related warnings
are available in the git repository at:
git://xenomai.org/xenomai-jki.git for-upstream
Jan Kiszka (1):
x86-hal: Include fix for NMI watchdog on 2.6.31
ksrc/arch/x86/nmi.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
x86-hal: Include fix for NMI watchdog on 2.6.31
Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
diff --git a/ksrc/arch/x86/nmi.c b/ksrc/arch/x86/nmi.c
index a9d9380..19cd16f 100644
--- a/ksrc/arch/x86/nmi.c
+++ b/ksrc/arch/x86/nmi.c
@@ -29,7 +29,9 @@
#include <linux/version.h>
#include <linux/nmi.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+#include <asm/perf_counter.h>
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
#include <asm/intel_arch_perfmon.h>
#endif /* Linux < 2.6.19 */
#include <asm/nmi.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]
reply other threads:[~2009-09-19 11:30 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=4AB4C0C1.7000708@domain.hid \
--to=jan.kiszka@domain.hid \
--cc=rpm@xenomai.org \
--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.