[Xenomai-git] Philippe Gerum : cobalt/kernel: unify naming of extern data - cobalt_pipeline
Module: xenomai-3
Branch: master
Commit: afa7dac3246825c9dd33d1b62cb9e8e139f975a8
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=afa7dac3246825c9dd33d1b62cb9e8e139f975a8
Author: Philippe Gerum r...@xenomai.org
Date: Tue Feb 17 11:19:38 2015 +0100
cobalt/kernel: unify naming of extern data - cobalt_pipeline
---
include/cobalt/kernel/apc.h|2 +-
include/cobalt/kernel/sched.h |4 +--
kernel/cobalt/apc.c| 18 ++--
kernel/cobalt/arch/arm/thread.c|2 +-
kernel/cobalt/arch/blackfin/thread.c |2 +-
kernel/cobalt/arch/nios2/thread.c |2 +-
kernel/cobalt/arch/powerpc/thread.c|2 +-
kernel/cobalt/arch/sh/thread.c |2 +-
kernel/cobalt/arch/x86/machine.c |2 +-
kernel/cobalt/arch/x86/thread.c|2 +-
.../cobalt/include/asm-generic/xenomai/machine.h |4 +--
kernel/cobalt/init.c | 30 ++--
kernel/cobalt/posix/syscall.c |2 +-
kernel/cobalt/procfs.c |6 ++--
14 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/include/cobalt/kernel/apc.h b/include/cobalt/kernel/apc.h
index 3cde7f3..b5d7962 100644
--- a/include/cobalt/kernel/apc.h
+++ b/include/cobalt/kernel/apc.h
@@ -38,7 +38,7 @@ static inline void __xnapc_schedule(int apc)
unsigned long *p =
__this_cpu_ptr(xnarch_percpu_machdata)-apc_pending;
if (!__test_and_set_bit(apc, p))
- ipipe_post_irq_root(xnarch_machdata.apc_virq);
+ ipipe_post_irq_root(cobalt_pipeline.apc_virq);
}
/**
diff --git a/include/cobalt/kernel/sched.h b/include/cobalt/kernel/sched.h
index 43c5e72..286db0f 100644
--- a/include/cobalt/kernel/sched.h
+++ b/include/cobalt/kernel/sched.h
@@ -210,7 +210,7 @@ static inline void xnsched_set_self_resched(struct xnsched
*sched)
sched-status |= XNRESCHED;
}
-#define xnsched_realtime_domain xnarch_machdata.domain
+#define xnsched_realtime_domain cobalt_pipeline.domain
/* Set resched flag for the given scheduler. */
#ifdef CONFIG_SMP
@@ -228,7 +228,7 @@ static inline void xnsched_set_resched(struct xnsched
*sched)
}
}
-#define xnsched_realtime_cpusxnarch_machdata.supported_cpus
+#define xnsched_realtime_cpuscobalt_pipeline.supported_cpus
static inline int xnsched_supported_cpu(int cpu)
{
diff --git a/kernel/cobalt/apc.c b/kernel/cobalt/apc.c
index a3714da..c2589eb 100644
--- a/kernel/cobalt/apc.c
+++ b/kernel/cobalt/apc.c
@@ -62,8 +62,8 @@ void apc_dispatch(unsigned int virq, void *arg)
while (*p) {
apc = ffnz(*p);
clear_bit(apc, p);
- handler = xnarch_machdata.apc_table[apc].handler;
- cookie = xnarch_machdata.apc_table[apc].cookie;
+ handler = cobalt_pipeline.apc_table[apc].handler;
+ cookie = cobalt_pipeline.apc_table[apc].cookie;
__this_cpu_ptr(xnarch_percpu_machdata)-apc_shots[apc]++;
spin_unlock(apc_lock);
handler(cookie);
@@ -120,16 +120,16 @@ int xnapc_alloc(const char *name,
spin_lock_irqsave(apc_lock, flags);
- if (xnarch_machdata.apc_map == ~0) {
+ if (cobalt_pipeline.apc_map == ~0) {
apc = -EBUSY;
goto out;
}
- apc = ffz(xnarch_machdata.apc_map);
- __set_bit(apc, xnarch_machdata.apc_map);
- xnarch_machdata.apc_table[apc].handler = handler;
- xnarch_machdata.apc_table[apc].cookie = cookie;
- xnarch_machdata.apc_table[apc].name = name;
+ apc = ffz(cobalt_pipeline.apc_map);
+ __set_bit(apc, cobalt_pipeline.apc_map);
+ cobalt_pipeline.apc_table[apc].handler = handler;
+ cobalt_pipeline.apc_table[apc].cookie = cookie;
+ cobalt_pipeline.apc_table[apc].name = name;
out:
spin_unlock_irqrestore(apc_lock, flags);
@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(xnapc_alloc);
void xnapc_free(int apc)
{
BUG_ON(apc 0 || apc = BITS_PER_LONG);
- clear_bit(apc, xnarch_machdata.apc_map);
+ clear_bit(apc, cobalt_pipeline.apc_map);
smp_mb__after_atomic();
}
EXPORT_SYMBOL_GPL(xnapc_free);
diff --git a/kernel/cobalt/arch/arm/thread.c b/kernel/cobalt/arch/arm/thread.c
index f3e0874..13d2176 100644
--- a/kernel/cobalt/arch/arm/thread.c
+++ b/kernel/cobalt/arch/arm/thread.c
@@ -342,7 +342,7 @@ void xnarch_switch_to(struct xnthread *out, struct xnthread
*in)
int xnarch_escalate(void)
{
if (ipipe_root_p) {
- ipipe_raise_irq(xnarch_machdata.escalate_virq);
+ ipipe_raise_irq(cobalt_pipeline.escalate_virq);
return 1;
}
diff --git a/kernel/cobalt/arch/blackfin/thread.c
b/kernel/cobalt/arch/blackfin/thread.c
index e0c5d54..d4cda91 100644
---
[Xenomai-git] Philippe Gerum : cobalt/kernel: unify naming of extern data - cobalt_pipeline
Module: xenomai-3
Branch: next
Commit: afa7dac3246825c9dd33d1b62cb9e8e139f975a8
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=afa7dac3246825c9dd33d1b62cb9e8e139f975a8
Author: Philippe Gerum r...@xenomai.org
Date: Tue Feb 17 11:19:38 2015 +0100
cobalt/kernel: unify naming of extern data - cobalt_pipeline
---
include/cobalt/kernel/apc.h|2 +-
include/cobalt/kernel/sched.h |4 +--
kernel/cobalt/apc.c| 18 ++--
kernel/cobalt/arch/arm/thread.c|2 +-
kernel/cobalt/arch/blackfin/thread.c |2 +-
kernel/cobalt/arch/nios2/thread.c |2 +-
kernel/cobalt/arch/powerpc/thread.c|2 +-
kernel/cobalt/arch/sh/thread.c |2 +-
kernel/cobalt/arch/x86/machine.c |2 +-
kernel/cobalt/arch/x86/thread.c|2 +-
.../cobalt/include/asm-generic/xenomai/machine.h |4 +--
kernel/cobalt/init.c | 30 ++--
kernel/cobalt/posix/syscall.c |2 +-
kernel/cobalt/procfs.c |6 ++--
14 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/include/cobalt/kernel/apc.h b/include/cobalt/kernel/apc.h
index 3cde7f3..b5d7962 100644
--- a/include/cobalt/kernel/apc.h
+++ b/include/cobalt/kernel/apc.h
@@ -38,7 +38,7 @@ static inline void __xnapc_schedule(int apc)
unsigned long *p =
__this_cpu_ptr(xnarch_percpu_machdata)-apc_pending;
if (!__test_and_set_bit(apc, p))
- ipipe_post_irq_root(xnarch_machdata.apc_virq);
+ ipipe_post_irq_root(cobalt_pipeline.apc_virq);
}
/**
diff --git a/include/cobalt/kernel/sched.h b/include/cobalt/kernel/sched.h
index 43c5e72..286db0f 100644
--- a/include/cobalt/kernel/sched.h
+++ b/include/cobalt/kernel/sched.h
@@ -210,7 +210,7 @@ static inline void xnsched_set_self_resched(struct xnsched
*sched)
sched-status |= XNRESCHED;
}
-#define xnsched_realtime_domain xnarch_machdata.domain
+#define xnsched_realtime_domain cobalt_pipeline.domain
/* Set resched flag for the given scheduler. */
#ifdef CONFIG_SMP
@@ -228,7 +228,7 @@ static inline void xnsched_set_resched(struct xnsched
*sched)
}
}
-#define xnsched_realtime_cpusxnarch_machdata.supported_cpus
+#define xnsched_realtime_cpuscobalt_pipeline.supported_cpus
static inline int xnsched_supported_cpu(int cpu)
{
diff --git a/kernel/cobalt/apc.c b/kernel/cobalt/apc.c
index a3714da..c2589eb 100644
--- a/kernel/cobalt/apc.c
+++ b/kernel/cobalt/apc.c
@@ -62,8 +62,8 @@ void apc_dispatch(unsigned int virq, void *arg)
while (*p) {
apc = ffnz(*p);
clear_bit(apc, p);
- handler = xnarch_machdata.apc_table[apc].handler;
- cookie = xnarch_machdata.apc_table[apc].cookie;
+ handler = cobalt_pipeline.apc_table[apc].handler;
+ cookie = cobalt_pipeline.apc_table[apc].cookie;
__this_cpu_ptr(xnarch_percpu_machdata)-apc_shots[apc]++;
spin_unlock(apc_lock);
handler(cookie);
@@ -120,16 +120,16 @@ int xnapc_alloc(const char *name,
spin_lock_irqsave(apc_lock, flags);
- if (xnarch_machdata.apc_map == ~0) {
+ if (cobalt_pipeline.apc_map == ~0) {
apc = -EBUSY;
goto out;
}
- apc = ffz(xnarch_machdata.apc_map);
- __set_bit(apc, xnarch_machdata.apc_map);
- xnarch_machdata.apc_table[apc].handler = handler;
- xnarch_machdata.apc_table[apc].cookie = cookie;
- xnarch_machdata.apc_table[apc].name = name;
+ apc = ffz(cobalt_pipeline.apc_map);
+ __set_bit(apc, cobalt_pipeline.apc_map);
+ cobalt_pipeline.apc_table[apc].handler = handler;
+ cobalt_pipeline.apc_table[apc].cookie = cookie;
+ cobalt_pipeline.apc_table[apc].name = name;
out:
spin_unlock_irqrestore(apc_lock, flags);
@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(xnapc_alloc);
void xnapc_free(int apc)
{
BUG_ON(apc 0 || apc = BITS_PER_LONG);
- clear_bit(apc, xnarch_machdata.apc_map);
+ clear_bit(apc, cobalt_pipeline.apc_map);
smp_mb__after_atomic();
}
EXPORT_SYMBOL_GPL(xnapc_free);
diff --git a/kernel/cobalt/arch/arm/thread.c b/kernel/cobalt/arch/arm/thread.c
index f3e0874..13d2176 100644
--- a/kernel/cobalt/arch/arm/thread.c
+++ b/kernel/cobalt/arch/arm/thread.c
@@ -342,7 +342,7 @@ void xnarch_switch_to(struct xnthread *out, struct xnthread
*in)
int xnarch_escalate(void)
{
if (ipipe_root_p) {
- ipipe_raise_irq(xnarch_machdata.escalate_virq);
+ ipipe_raise_irq(cobalt_pipeline.escalate_virq);
return 1;
}
diff --git a/kernel/cobalt/arch/blackfin/thread.c
b/kernel/cobalt/arch/blackfin/thread.c
index e0c5d54..d4cda91 100644
---
