From: Heikki Lindholm <holindho@domain.hid>
To: xenomai@xenomai.org
Subject: [Xenomai-core] [PATCH] Xenomai stable ppc64 I-pipe sync
Date: Mon, 14 Nov 2005 13:41:53 +0200 [thread overview]
Message-ID: <43787801.5040101@domain.hid> (raw)
[-- Attachment #1: Type: text/plain, Size: 92 bytes --]
Sync the ppc64 arch of the stable tree to work with I-pipe kernel also.
-- Heikki Lindholm
[-- Attachment #2: xenomai-051108-ppc64-ipipe.patch --]
[-- Type: text/plain, Size: 2528 bytes --]
diff -Nru xenomai/arch/ppc64/hal/switch.S xenomai-devel/arch/ppc64/hal/switch.S
--- xenomai/arch/ppc64/hal/switch.S 2005-10-11 10:32:30.000000000 +0300
+++ xenomai-devel/arch/ppc64/hal/switch.S 2005-11-08 12:49:18.000000000 +0200
@@ -26,7 +26,6 @@
#include <asm/processor.h>
#include <asm/cputable.h>
#include <asm/page.h>
-#include <asm/offsets.h>
#include <asm/ppc_asm.h>
#include <xeno_config.h>
diff -Nru xenomai/include/nucleus/asm-ppc64/hal.h xenomai-devel/include/nucleus/asm-ppc64/hal.h
--- xenomai/include/nucleus/asm-ppc64/hal.h 2005-10-11 10:30:03.000000000 +0300
+++ xenomai-devel/include/nucleus/asm-ppc64/hal.h 2005-11-08 11:32:17.000000000 +0200
@@ -98,7 +98,11 @@
#include <nucleus/asm/atomic.h>
#include <asm/processor.h>
+#ifdef CONFIG_ADEOS_CORE
#define RTHAL_TIMER_IRQ ADEOS_TIMER_VIRQ
+#else /* !CONFIG_ADEOS_CORE */
+#define RTHAL_TIMER_IRQ IPIPE_TIMER_VIRQ
+#endif /* CONFIG_ADEOS_CORE */
#define rthal_irq_descp(irq) (&irq_desc[(irq)])
diff -Nru xenomai/include/nucleus/asm-ppc64/system.h xenomai-devel/include/nucleus/asm-ppc64/system.h
--- xenomai/include/nucleus/asm-ppc64/system.h 2005-11-01 11:04:04.000000000 +0200
+++ xenomai-devel/include/nucleus/asm-ppc64/system.h 2005-11-08 11:35:38.000000000 +0200
@@ -31,10 +31,12 @@
#include <linux/config.h>
#include <linux/ptrace.h>
+#ifdef CONFIG_ADEOS_CORE
#if ADEOS_RELEASE_NUMBER < 0x02060201
#error "Adeos 2.6r2c1/ppc64 or above is required to run this software; please upgrade."
#error "See http://download.gna.org/adeos/patches/v2.6/ppc64/"
#endif
+#endif /* CONFIG_ADEOS_CORE */
#define XNARCH_DEFAULT_TICK 1000000 /* ns, i.e. 1ms */
#define XNARCH_HOST_TICK (1000000000UL/HZ)
@@ -102,11 +104,19 @@
/* The following predicates are only usable over a regular Linux stack
* context. */
+#ifdef CONFIG_ADEOS_CORE
#define xnarch_fault_pf_p(fi) ((fi)->exception == ADEOS_ACCESS_TRAP)
#define xnarch_fault_bp_p(fi) ((current->ptrace & PT_PTRACED) && \
((fi)->exception == ADEOS_IABR_TRAP || \
(fi)->exception == ADEOS_SSTEP_TRAP || \
(fi)->exception == ADEOS_PERFMON_TRAP))
+#else /* !CONFIG_ADEOS_CORE */
+#define xnarch_fault_pf_p(fi) ((fi)->exception == IPIPE_TRAP_ACCESS)
+#define xnarch_fault_bp_p(fi) ((current->ptrace & PT_PTRACED) && \
+ ((fi)->exception == IPIPE_TRAP_IABR || \
+ (fi)->exception == IPIPE_TRAP_SSTEP || \
+ (fi)->exception == IPIPE_TRAP_PERFMON))
+#endif /* CONFIG_ADEOS_CORE */
#define xnarch_fault_notify(fi) (!xnarch_fault_bp_p(fi))
next reply other threads:[~2005-11-14 11:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-14 11:41 Heikki Lindholm [this message]
2005-11-14 14:47 ` [Xenomai-core] [PATCH] Xenomai stable ppc64 I-pipe sync Philippe Gerum
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=43787801.5040101@domain.hid \
--to=holindho@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.