Module: xenomai-head
Branch: master
Commit: 37faac2b1aa92cb975f0a34b2f042259562aa39c
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=37faac2b1aa92cb975f0a34b2f042259562aa39c
Author: Philippe Gerum <r...@xenomai.org>
Date: Tue Sep 6 11:33:39 2011 +0200
hal/generic: do not return previous IRQ affinity mask
No in-tree code ever used the previous affinity mask returned after
the IRQ affinity was changed, and getting this information became
painfully harder with post-2.6.38 kernels. Let's get rid of this
requirement.
---
include/asm-generic/bits/intr.h | 6 +++---
include/asm-sim/bits/intr.h | 5 ++---
include/nucleus/intr.h | 8 +++++---
ksrc/nucleus/intr.c | 4 ++--
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/include/asm-generic/bits/intr.h b/include/asm-generic/bits/intr.h
index 68f0bd4..26f7aa1 100644
--- a/include/asm-generic/bits/intr.h
+++ b/include/asm-generic/bits/intr.h
@@ -57,10 +57,10 @@ static inline void xnarch_chain_irq (unsigned irq)
rthal_irq_host_pend(irq);
}
-static inline xnarch_cpumask_t xnarch_set_irq_affinity (unsigned irq,
- xnarch_cpumask_t
affinity)
+static inline void xnarch_set_irq_affinity (unsigned irq,
+ xnarch_cpumask_t affinity)
{
- return rthal_set_irq_affinity(irq,affinity);
+ rthal_set_irq_affinity(irq,affinity);
}
static inline void *xnarch_get_irq_cookie(unsigned irq)
diff --git a/include/asm-sim/bits/intr.h b/include/asm-sim/bits/intr.h
index 2cf0ddf..3978a74 100644
--- a/include/asm-sim/bits/intr.h
+++ b/include/asm-sim/bits/intr.h
@@ -56,10 +56,9 @@ static inline void xnarch_chain_irq (unsigned irq)
/* empty */
}
-static inline unsigned long xnarch_set_irq_affinity (unsigned irq,
- unsigned long affinity)
+static inline void xnarch_set_irq_affinity (unsigned irq,
+ unsigned long affinity)
{
- return 0;
}
static inline void xnarch_relay_tick(void)
diff --git a/include/nucleus/intr.h b/include/nucleus/intr.h
index 5cef8a1..20a625d 100644
--- a/include/nucleus/intr.h
+++ b/include/nucleus/intr.h
@@ -126,11 +126,13 @@ int xnintr_enable(xnintr_t *intr);
int xnintr_disable(xnintr_t *intr);
-xnarch_cpumask_t xnintr_affinity(xnintr_t *intr,
- xnarch_cpumask_t cpumask);
+void xnintr_affinity(xnintr_t *intr,
+ xnarch_cpumask_t cpumask);
int xnintr_query_init(xnintr_iterator_t *iterator);
-int xnintr_query_next(int irq, xnintr_iterator_t *iterator, char *name_buf);
+
+int xnintr_query_next(int irq, xnintr_iterator_t *iterator,
+ char *name_buf);
#ifdef __cplusplus
}
diff --git a/ksrc/nucleus/intr.c b/ksrc/nucleus/intr.c
index 4a42513..370e71e 100644
--- a/ksrc/nucleus/intr.c
+++ b/ksrc/nucleus/intr.c
@@ -884,12 +884,12 @@ EXPORT_SYMBOL_GPL(xnintr_disable);
* cpumask could be meaningless.
*/
-xnarch_cpumask_t xnintr_affinity(xnintr_t *intr, xnarch_cpumask_t cpumask)
+void xnintr_affinity(xnintr_t *intr, xnarch_cpumask_t cpumask)
{
trace_mark(xn_nucleus, irq_affinity, "irq %u %lu",
intr->irq, *(unsigned long *)&cpumask);
- return xnarch_set_irq_affinity(intr->irq, cpumask);
+ xnarch_set_irq_affinity(intr->irq, cpumask);
}
EXPORT_SYMBOL_GPL(xnintr_affinity);
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
