Module: xenomai-forge
Branch: next
Commit: 70e617fc32c903353d6283ece5d605dc77810579
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=70e617fc32c903353d6283ece5d605dc77810579
Author: Philippe Gerum <r...@xenomai.org>
Date: Sun Sep 21 10:54:22 2014 +0200
cobalt: rename CONFIG_XENO_HW to CONFIG_XENO_ARCH
This option class is for machine/platform-specific tunables,
"hardware" has always been too generic.
---
include/cobalt/kernel/lock.h | 2 +-
include/cobalt/kernel/ppd.h | 4 ++--
include/cobalt/kernel/rtdm/fd.h | 8 +++----
include/cobalt/kernel/sched.h | 10 ++++-----
include/cobalt/kernel/thread.h | 4 ++--
kernel/cobalt/Kconfig | 4 ++--
kernel/cobalt/arch/arm/Kconfig | 14 ++++++-------
.../cobalt/arch/arm/include/asm/xenomai/thread.h | 12 +++++------
kernel/cobalt/arch/arm/switch.S | 2 +-
kernel/cobalt/arch/arm/thread.c | 4 ++--
kernel/cobalt/arch/blackfin/Kconfig | 2 +-
kernel/cobalt/arch/nios2/Kconfig | 2 +-
kernel/cobalt/arch/powerpc/Kconfig | 16 +++++++-------
kernel/cobalt/arch/powerpc/Makefile | 2 +-
.../arch/powerpc/include/asm/xenomai/fptest.h | 4 ++--
.../arch/powerpc/include/asm/xenomai/thread.h | 8 +++----
kernel/cobalt/arch/powerpc/thread.c | 4 ++--
kernel/cobalt/arch/sh/Kconfig | 8 +++----
kernel/cobalt/arch/sh/include/asm/xenomai/thread.h | 8 +++----
kernel/cobalt/arch/sh/thread.c | 4 ++--
kernel/cobalt/arch/x86/Kconfig | 6 +++---
.../cobalt/arch/x86/include/asm/xenomai/thread.h | 6 +++---
kernel/cobalt/arch/x86/thread.c | 4 ++--
kernel/cobalt/debug.c | 2 +-
kernel/cobalt/include/asm-generic/xenomai/thread.h | 4 ++--
kernel/cobalt/init.c | 2 +-
kernel/cobalt/lock.c | 2 +-
kernel/cobalt/posix/cond.c | 2 +-
kernel/cobalt/posix/mutex.c | 2 +-
kernel/cobalt/posix/process.c | 16 +++++++-------
kernel/cobalt/posix/process.h | 4 ++--
kernel/cobalt/posix/sem.c | 2 +-
kernel/cobalt/rtdm/fd.c | 16 +++++++-------
kernel/cobalt/sched.c | 22 ++++++++++----------
kernel/cobalt/thread.c | 18 ++++++++--------
35 files changed, 115 insertions(+), 115 deletions(-)
diff --git a/include/cobalt/kernel/lock.h b/include/cobalt/kernel/lock.h
index d576c0a..b0c34bf 100644
--- a/include/cobalt/kernel/lock.h
+++ b/include/cobalt/kernel/lock.h
@@ -208,7 +208,7 @@ static inline void ____xnlock_put(struct xnlock *lock /*,
*/ XNLOCK_DBG_CONTEXT_
atomic_set(&lock->owner, ~0);
}
-#ifndef CONFIG_XENO_HW_OUTOFLINE_XNLOCK
+#ifndef CONFIG_XENO_ARCH_OUTOFLINE_XNLOCK
#define ___xnlock_get ____xnlock_get
#define ___xnlock_put ____xnlock_put
#else /* out of line xnlock */
diff --git a/include/cobalt/kernel/ppd.h b/include/cobalt/kernel/ppd.h
index e76350c..4d42427 100644
--- a/include/cobalt/kernel/ppd.h
+++ b/include/cobalt/kernel/ppd.h
@@ -30,7 +30,7 @@ struct cobalt_umm {
void (*release)(struct cobalt_umm *umm);
};
-struct xnsys_ppd {
+struct cobalt_ppd {
struct cobalt_umm umm;
unsigned long mayday_addr;
atomic_t refcnt;
@@ -38,6 +38,6 @@ struct xnsys_ppd {
struct rb_root fds;
};
-extern struct xnsys_ppd __xnsys_global_ppd;
+extern struct cobalt_ppd __xnsys_global_ppd;
#endif /* _COBALT_KERNEL_PPD_H */
diff --git a/include/cobalt/kernel/rtdm/fd.h b/include/cobalt/kernel/rtdm/fd.h
index 920b276..ec327b3 100644
--- a/include/cobalt/kernel/rtdm/fd.h
+++ b/include/cobalt/kernel/rtdm/fd.h
@@ -29,7 +29,7 @@ struct vm_area_struct;
struct rtdm_fd;
struct _rtdm_mmap_request;
struct xnselector;
-struct xnsys_ppd;
+struct cobalt_ppd;
/**
* @file
@@ -295,7 +295,7 @@ struct rtdm_fd_ops {
struct rtdm_fd {
unsigned int magic;
struct rtdm_fd_ops *ops;
- struct xnsys_ppd *owner;
+ struct cobalt_ppd *owner;
unsigned int refs;
int minor;
struct list_head cleanup;
@@ -307,7 +307,7 @@ int __rtdm_anon_getfd(const char *name, int flags);
void __rtdm_anon_putfd(int ufd);
-static inline struct xnsys_ppd *rtdm_fd_owner(struct rtdm_fd *fd)
+static inline struct cobalt_ppd *rtdm_fd_owner(struct rtdm_fd *fd)
{
return fd->owner;
}
@@ -349,7 +349,7 @@ int rtdm_fd_valid_p(int ufd);
int rtdm_fd_select(int ufd, struct xnselector *selector,
unsigned int type);
-void rtdm_fd_cleanup(struct xnsys_ppd *p);
+void rtdm_fd_cleanup(struct cobalt_ppd *p);
void rtdm_fd_init(void);
diff --git a/include/cobalt/kernel/sched.h b/include/cobalt/kernel/sched.h
index c54ece1..424538b 100644
--- a/include/cobalt/kernel/sched.h
+++ b/include/cobalt/kernel/sched.h
@@ -94,10 +94,10 @@ struct xnsched {
struct xntimer rrbtimer;
/*!< Root thread control block. */
struct xnthread rootcb;
-#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
+#ifdef CONFIG_XENO_ARCH_UNLOCKED_SWITCH
struct xnthread *last;
#endif
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
/*!< Thread owning the current FPU context. */
struct xnthread *fpuholder;
#endif
@@ -373,7 +373,7 @@ static inline int xnsched_primary_p(void)
return !xnsched_unblockable_p();
}
-#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
+#ifdef CONFIG_XENO_ARCH_UNLOCKED_SWITCH
struct xnsched *xnsched_finish_unlocked_switch(struct xnsched *sched);
@@ -385,7 +385,7 @@ int xnsched_maybe_resched_after_unlocked_switch(struct
xnsched *sched)
return sched->status & XNRESCHED;
}
-#else /* !CONFIG_XENO_HW_UNLOCKED_SWITCH */
+#else /* !CONFIG_XENO_ARCH_UNLOCKED_SWITCH */
static inline struct xnsched *
xnsched_finish_unlocked_switch(struct xnsched *sched)
@@ -402,7 +402,7 @@ xnsched_maybe_resched_after_unlocked_switch(struct xnsched
*sched)
return 0;
}
-#endif /* !CONFIG_XENO_HW_UNLOCKED_SWITCH */
+#endif /* !CONFIG_XENO_ARCH_UNLOCKED_SWITCH */
#ifdef CONFIG_XENO_OPT_WATCHDOG
static inline void xnsched_reset_watchdog(struct xnsched *sched)
diff --git a/include/cobalt/kernel/thread.h b/include/cobalt/kernel/thread.h
index e41ac06..8b66f57 100644
--- a/include/cobalt/kernel/thread.h
+++ b/include/cobalt/kernel/thread.h
@@ -413,11 +413,11 @@ int xnthread_wait_complete_p(struct xnthread_wait_context
*wc)
return wc->posted;
}
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
void xnthread_switch_fpu(struct xnsched *sched);
#else
static inline void xnthread_switch_fpu(struct xnsched *sched) { }
-#endif /* CONFIG_XENO_HW_FPU */
+#endif /* CONFIG_XENO_ARCH_FPU */
void xnthread_init_shadow_tcb(struct xnthread *thread,
struct task_struct *task);
diff --git a/kernel/cobalt/Kconfig b/kernel/cobalt/Kconfig
index 8937d75..c80ae91 100644
--- a/kernel/cobalt/Kconfig
+++ b/kernel/cobalt/Kconfig
@@ -166,7 +166,7 @@ config XENO_OPT_RR_QUANTUM
config XENO_OPT_AUTOTUNE
bool "Auto-tuning"
- default y if XENO_HW_AUTOTUNE
+ default y if XENO_ARCH_AUTOTUNE
select XENO_DRIVERS_AUTOTUNE
help
Enable auto-tuning capabilities. Auto-tuning is used for
@@ -298,7 +298,7 @@ config XENO_OPT_REGISTRY_NRSLOTS
the maximum number of resources the registry can handle.
config XENO_OPT_SYS_HEAPSZ
- int "Size of the system heap (Kb)"
+ int "Size of system heap (Kb)"
default 256
help
diff --git a/kernel/cobalt/arch/arm/Kconfig b/kernel/cobalt/arch/arm/Kconfig
index b225368..03826de 100644
--- a/kernel/cobalt/arch/arm/Kconfig
+++ b/kernel/cobalt/arch/arm/Kconfig
@@ -1,9 +1,9 @@
source "kernel/xenomai/Kconfig"
source "drivers/xenomai/Kconfig"
-menu "Platform-specific options"
+menu "Machine/platform-specific options"
-config XENO_HW_UNLOCKED_SWITCH
+config XENO_ARCH_UNLOCKED_SWITCH
bool "Unlocked context switch"
default y
help
@@ -20,18 +20,18 @@ endmenu
config IPIPE_WANT_PREEMPTIBLE_SWITCH
bool
- default y if XENO_HW_UNLOCKED_SWITCH
- default n if !XENO_HW_UNLOCKED_SWITCH
+ default y if XENO_ARCH_UNLOCKED_SWITCH
+ default n if !XENO_ARCH_UNLOCKED_SWITCH
config IPIPE_WANT_ACTIVE_MM
def_bool y
-config XENO_HW_WANT_TIP
+config XENO_ARCH_WANT_TIP
def_bool y
-config XENO_HW_FPU
+config XENO_ARCH_FPU
def_bool VFP
-config XENO_HW_OUTOFLINE_XNLOCK
+config XENO_ARCH_OUTOFLINE_XNLOCK
bool
default y
diff --git a/kernel/cobalt/arch/arm/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm/include/asm/xenomai/thread.h
index d2dda29..3d8e699 100644
--- a/kernel/cobalt/arch/arm/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm/include/asm/xenomai/thread.h
@@ -21,15 +21,15 @@
#include <asm-generic/xenomai/thread.h>
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
#ifdef CONFIG_VFP
#include <asm/vfp.h>
#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_HW_FPU */
+#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
#ifdef CONFIG_VFP
union vfp_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
@@ -66,7 +66,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_HW_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -87,7 +87,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_HW_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -113,7 +113,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_HW_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm/switch.S b/kernel/cobalt/arch/arm/switch.S
index a35387e..505fd5a 100644
--- a/kernel/cobalt/arch/arm/switch.S
+++ b/kernel/cobalt/arch/arm/switch.S
@@ -54,7 +54,7 @@
.text
-#if defined(CONFIG_VFP) && defined(CONFIG_XENO_HW_FPU)
+#if defined(CONFIG_VFP) && defined(CONFIG_XENO_ARCH_FPU)
/* Copied from vfp_save_state in arch/arm/vfp/vfphw.S
* r0 = pointer to union vfp_state, r1 = fpexc
*/
diff --git a/kernel/cobalt/arch/arm/thread.c b/kernel/cobalt/arch/arm/thread.c
index a6e5dc3..f3e0874 100644
--- a/kernel/cobalt/arch/arm/thread.c
+++ b/kernel/cobalt/arch/arm/thread.c
@@ -34,7 +34,7 @@ asmlinkage void __asm_thread_switch(struct thread_info *out,
asmlinkage void __asm_thread_trampoline(void);
-#if defined(CONFIG_XENO_HW_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
static unsigned int vfp_checked;
static DEFINE_MUTEX(vfp_check_lock);
@@ -308,7 +308,7 @@ void xnarch_init_shadow_tcb(struct xnthread *thread)
/* XNFPU is set upon first FPU fault */
xnthread_clear_state(thread, XNFPU);
}
-#endif /* CONFIG_XENO_HW_FPU && CONFIG_VFP*/
+#endif /* CONFIG_XENO_ARCH_FPU && CONFIG_VFP*/
void xnarch_switch_to(struct xnthread *out, struct xnthread *in)
{
diff --git a/kernel/cobalt/arch/blackfin/Kconfig
b/kernel/cobalt/arch/blackfin/Kconfig
index d01dc9d..9f19382 100644
--- a/kernel/cobalt/arch/blackfin/Kconfig
+++ b/kernel/cobalt/arch/blackfin/Kconfig
@@ -1,4 +1,4 @@
-config XENO_HW_FPU
+config XENO_ARCH_FPU
def_bool n
source "kernel/xenomai/Kconfig"
diff --git a/kernel/cobalt/arch/nios2/Kconfig b/kernel/cobalt/arch/nios2/Kconfig
index d01dc9d..9f19382 100644
--- a/kernel/cobalt/arch/nios2/Kconfig
+++ b/kernel/cobalt/arch/nios2/Kconfig
@@ -1,4 +1,4 @@
-config XENO_HW_FPU
+config XENO_ARCH_FPU
def_bool n
source "kernel/xenomai/Kconfig"
diff --git a/kernel/cobalt/arch/powerpc/Kconfig
b/kernel/cobalt/arch/powerpc/Kconfig
index 6e8f68f..bc519a5 100644
--- a/kernel/cobalt/arch/powerpc/Kconfig
+++ b/kernel/cobalt/arch/powerpc/Kconfig
@@ -1,7 +1,7 @@
source "kernel/xenomai/Kconfig"
source "drivers/xenomai/Kconfig"
-config XENO_HW_MATH_EMU
+config XENO_ARCH_MATH_EMU
bool
default y if MATH_EMU || MATH_EMULATION
@@ -11,21 +11,21 @@ config IPIPE_WANT_ACTIVE_MM
config IPIPE_WANT_PREEMPTIBLE_SWITCH
bool
select IPIPE_WANT_ACTIVE_MM
- default y if XENO_HW_UNLOCKED_SWITCH
- default n if !XENO_HW_UNLOCKED_SWITCH
+ default y if XENO_ARCH_UNLOCKED_SWITCH
+ default n if !XENO_ARCH_UNLOCKED_SWITCH
-config XENO_HW_WANT_TIP
+config XENO_ARCH_WANT_TIP
bool
-config XENO_HW_FPU
+config XENO_ARCH_FPU
def_bool PPC_FPU
-menu "Platform-specific options"
+menu "Machine/platform-specific options"
-config XENO_HW_UNLOCKED_SWITCH
+config XENO_ARCH_UNLOCKED_SWITCH
bool "Unlocked context switch"
depends on IPIPE_HAVE_PREEMPTIBLE_SWITCH
- select XENO_HW_WANT_TIP
+ select XENO_ARCH_WANT_TIP
default y
help
diff --git a/kernel/cobalt/arch/powerpc/Makefile
b/kernel/cobalt/arch/powerpc/Makefile
index 24ece6f..adfca75 100644
--- a/kernel/cobalt/arch/powerpc/Makefile
+++ b/kernel/cobalt/arch/powerpc/Makefile
@@ -3,6 +3,6 @@ obj-$(CONFIG_XENOMAI) += xenomai.o
xenomai-y := machine.o mayday.o thread.o switch_$(CONFIG_WORD_SIZE).o
-xenomai-$(CONFIG_XENO_HW_FPU) += fpu.o
+xenomai-$(CONFIG_XENO_ARCH_FPU) += fpu.o
ccflags-y := -Iarch/powerpc/xenomai/include -Iinclude/xenomai
diff --git a/kernel/cobalt/arch/powerpc/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/powerpc/include/asm/xenomai/fptest.h
index 6356e8e..d99fa64 100644
--- a/kernel/cobalt/arch/powerpc/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/powerpc/include/asm/xenomai/fptest.h
@@ -27,14 +27,14 @@ static inline int fp_kernel_supported(void)
#ifdef CONFIG_PPC_FPU
return 1;
#else /* !CONFIG_PPC_FPU */
-#ifdef CONFIG_XENO_HW_MATH_EMU
+#ifdef CONFIG_XENO_ARCH_MATH_EMU
static int once = 0;
if (!once) {
once = 1;
printk("Warning: math emulation code defined in kernel\n"
" no kernel-based FPU support for this
platform\n");
}
-#endif /* !CONFIG_XENO_HW_MATH_EMU */
+#endif /* !CONFIG_XENO_ARCH_MATH_EMU */
return 0;
#endif /* !CONFIG_PPC_FPU */
}
diff --git a/kernel/cobalt/arch/powerpc/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/powerpc/include/asm/xenomai/thread.h
index 02e4e6d..8858bdd 100644
--- a/kernel/cobalt/arch/powerpc/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/powerpc/include/asm/xenomai/thread.h
@@ -23,7 +23,7 @@
struct xnarchtcb {
struct xntcb core;
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
struct thread_struct *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
#else
@@ -50,7 +50,7 @@ struct xnarchtcb {
static inline void xnarch_enter_root(struct xnthread *root) { }
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -66,13 +66,13 @@ static inline void xnarch_init_shadow_tcb(struct xnthread
*thread)
void xnarch_leave_root(struct xnthread *root);
-#else /* !CONFIG_XENO_HW_FPU */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
static inline void xnarch_leave_root(struct xnthread *root) { }
-#endif /* !CONFIG_XENO_HW_FPU */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline int
xnarch_handle_fpu_fault(struct xnthread *from,
diff --git a/kernel/cobalt/arch/powerpc/thread.c
b/kernel/cobalt/arch/powerpc/thread.c
index 53bbcf7..a648ba1 100644
--- a/kernel/cobalt/arch/powerpc/thread.c
+++ b/kernel/cobalt/arch/powerpc/thread.c
@@ -59,7 +59,7 @@ void xnarch_switch_to(struct xnthread *out, struct xnthread
*in)
__asm_thread_switch(out_tcb->core.tsp, in_tcb->core.tsp);
}
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
asmlinkage void __asm_init_fpu(struct thread_struct *ts);
@@ -192,7 +192,7 @@ void xnarch_leave_root(struct xnthread *root)
&rootcb->core.user_fpu_owner->thread : NULL;
}
-#endif /* CONFIG_XENO_HW_FPU */
+#endif /* CONFIG_XENO_ARCH_FPU */
int xnarch_escalate(void)
{
diff --git a/kernel/cobalt/arch/sh/Kconfig b/kernel/cobalt/arch/sh/Kconfig
index f4ff6b6..3f92993 100644
--- a/kernel/cobalt/arch/sh/Kconfig
+++ b/kernel/cobalt/arch/sh/Kconfig
@@ -1,16 +1,16 @@
config IPIPE_WANT_ACTIVE_MM
bool
-config XENO_HW_FPU
+config XENO_ARCH_FPU
def_bool SH_FPU
-menu "Hardware options"
+menu "Machine/platform-specific options"
config IPIPE_WANT_PREEMPTIBLE_SWITCH
bool
select IPIPE_WANT_ACTIVE_MM
- default y if XENO_HW_UNLOCKED_SWITCH
- default n if !XENO_HW_UNLOCKED_SWITCH
+ default y if XENO_ARCH_UNLOCKED_SWITCH
+ default n if !XENO_ARCH_UNLOCKED_SWITCH
endmenu
diff --git a/kernel/cobalt/arch/sh/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/sh/include/asm/xenomai/thread.h
index c53cce6..654bfa7 100644
--- a/kernel/cobalt/arch/sh/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/sh/include/asm/xenomai/thread.h
@@ -23,7 +23,7 @@
struct xnarchtcb {
struct xntcb core;
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
struct thread_struct *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
#else
@@ -46,7 +46,7 @@ struct xnarchtcb {
static inline void xnarch_enter_root(struct xnthread *root) { }
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
void xnarch_leave_root(struct xnthread *root);
@@ -58,13 +58,13 @@ static inline void xnarch_init_root_tcb(struct xnthread
*thread)
void xnarch_init_shadow_tcb(struct xnthread *thread);
-#else /* !CONFIG_XENO_HW_FPU */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_leave_root(struct xnthread *root) { }
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
-#endif /* !CONFIG_XENO_HW_FPU */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline int
xnarch_handle_fpu_fault(struct xnthread *from,
diff --git a/kernel/cobalt/arch/sh/thread.c b/kernel/cobalt/arch/sh/thread.c
index 7dbf386..782dd51 100644
--- a/kernel/cobalt/arch/sh/thread.c
+++ b/kernel/cobalt/arch/sh/thread.c
@@ -119,7 +119,7 @@ void xnarch_switch_to(struct xnthread *out, struct xnthread
*in)
do_switch_threads(out_tcb, in_tcb, prev, next);
}
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
#define FPSCR_RCHG 0x00000000
@@ -296,7 +296,7 @@ void xnarch_leave_root(struct xnthread *root)
&rootcb->core.user_fpu_owner->thread : NULL;
}
-#endif /* CONFIG_XENO_HW_FPU */
+#endif /* CONFIG_XENO_ARCH_FPU */
int xnarch_escalate(void)
{
diff --git a/kernel/cobalt/arch/x86/Kconfig b/kernel/cobalt/arch/x86/Kconfig
index 21587b0..cc85389 100644
--- a/kernel/cobalt/arch/x86/Kconfig
+++ b/kernel/cobalt/arch/x86/Kconfig
@@ -1,10 +1,10 @@
-config XENO_HW_FPU
+config XENO_ARCH_FPU
def_bool y
-config XENO_HW_AUTOTUNE
+config XENO_ARCH_AUTOTUNE
def_bool y
-config XENO_HW_X32
+config XENO_ARCH_X32
def_bool X86_X32
select XENO_OPT_SYS3264
diff --git a/kernel/cobalt/arch/x86/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/x86/include/asm/xenomai/thread.h
index df09c28..748434e 100644
--- a/kernel/cobalt/arch/x86/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/x86/include/asm/xenomai/thread.h
@@ -63,14 +63,14 @@ static inline int xnarch_shadow_p(struct xnarchtcb *tcb,
struct task_struct *tas
((d)->exception == 1 || (d)->exception == 3))
#define xnarch_fault_notify(d) (!xnarch_fault_bp_p(d))
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
void xnarch_save_fpu(struct xnthread *thread);
void xnarch_switch_fpu(struct xnthread *from, struct xnthread *to);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_HW_FPU */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_save_fpu(struct xnthread *thread) { }
static inline void
@@ -86,7 +86,7 @@ xnarch_handle_fpu_fault(struct xnthread *from,
return 0;
}
-#endif /* !CONFIG_XENO_HW_FPU */
+#endif /* !CONFIG_XENO_ARCH_FPU */
void xnarch_init_root_tcb(struct xnthread *thread);
diff --git a/kernel/cobalt/arch/x86/thread.c b/kernel/cobalt/arch/x86/thread.c
index 946cf2b..07d677c 100644
--- a/kernel/cobalt/arch/x86/thread.c
+++ b/kernel/cobalt/arch/x86/thread.c
@@ -203,7 +203,7 @@ void xnarch_switch_to(struct xnthread *out, struct xnthread
*in)
stts();
}
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
#ifdef CONFIG_X86_64
#define XSAVE_PREFIX "0x48,"
@@ -393,7 +393,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct
xnthread *to)
clear_stopped_child_used_math(p);
}
-#endif /* CONFIG_XENO_HW_FPU */
+#endif /* CONFIG_XENO_ARCH_FPU */
void xnarch_init_root_tcb(struct xnthread *thread)
{
diff --git a/kernel/cobalt/debug.c b/kernel/cobalt/debug.c
index 8a5a8b5..a809dc9 100644
--- a/kernel/cobalt/debug.c
+++ b/kernel/cobalt/debug.c
@@ -650,7 +650,7 @@ EXPORT_SYMBOL_GPL(xnlock_dbg_release);
void xndebug_shadow_init(struct xnthread *thread)
{
- struct xnsys_ppd *sys_ppd;
+ struct cobalt_ppd *sys_ppd;
size_t len;
sys_ppd = cobalt_ppd_get(0);
diff --git a/kernel/cobalt/include/asm-generic/xenomai/thread.h
b/kernel/cobalt/include/asm-generic/xenomai/thread.h
index 370fd74..5c1bcc4 100644
--- a/kernel/cobalt/include/asm-generic/xenomai/thread.h
+++ b/kernel/cobalt/include/asm-generic/xenomai/thread.h
@@ -33,10 +33,10 @@ struct xntcb {
struct mm_struct *mm;
struct mm_struct *active_mm;
struct thread_struct ts;
-#ifdef CONFIG_XENO_HW_WANT_TIP
+#ifdef CONFIG_XENO_ARCH_WANT_TIP
struct thread_info *tip;
#endif
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
struct task_struct *user_fpu_owner;
#endif
};
diff --git a/kernel/cobalt/init.c b/kernel/cobalt/init.c
index aaefabb..a3681e5 100644
--- a/kernel/cobalt/init.c
+++ b/kernel/cobalt/init.c
@@ -71,7 +71,7 @@ int __xnsys_disabled;
module_param_named(disable, __xnsys_disabled, int, 0444);
EXPORT_SYMBOL_GPL(__xnsys_disabled);
-struct xnsys_ppd __xnsys_global_ppd = {
+struct cobalt_ppd __xnsys_global_ppd = {
.exe_path = "vmlinux",
};
EXPORT_SYMBOL_GPL(__xnsys_global_ppd);
diff --git a/kernel/cobalt/lock.c b/kernel/cobalt/lock.c
index 24df298..5c339b5 100644
--- a/kernel/cobalt/lock.c
+++ b/kernel/cobalt/lock.c
@@ -57,7 +57,7 @@ void __xnlock_spin(int cpu, struct xnlock *lock /*, */
XNLOCK_DBG_CONTEXT_ARGS)
}
EXPORT_SYMBOL_GPL(__xnlock_spin);
-#ifdef CONFIG_XENO_HW_OUTOFLINE_XNLOCK
+#ifdef CONFIG_XENO_ARCH_OUTOFLINE_XNLOCK
int ___xnlock_get(struct xnlock *lock /*, */ XNLOCK_DBG_CONTEXT_ARGS)
{
return ____xnlock_get(lock /* , */ XNLOCK_DBG_PASS_CONTEXT);
diff --git a/kernel/cobalt/posix/cond.c b/kernel/cobalt/posix/cond.c
index 0e91f29..fb5a028 100644
--- a/kernel/cobalt/posix/cond.c
+++ b/kernel/cobalt/posix/cond.c
@@ -56,7 +56,7 @@ pthread_cond_init(struct cobalt_cond_shadow *cnd, const
struct cobalt_condattr *
int synch_flags = XNSYNCH_PRIO | XNSYNCH_NOPIP, ret;
struct cobalt_cond *cond, *old_cond;
struct cobalt_cond_state *state;
- struct xnsys_ppd *sys_ppd;
+ struct cobalt_ppd *sys_ppd;
struct list_head *condq;
spl_t s;
diff --git a/kernel/cobalt/posix/mutex.c b/kernel/cobalt/posix/mutex.c
index 0f54b1b..30ad1e5 100644
--- a/kernel/cobalt/posix/mutex.c
+++ b/kernel/cobalt/posix/mutex.c
@@ -28,7 +28,7 @@ static int cobalt_mutex_init_inner(struct cobalt_mutex_shadow
*shadow,
const struct cobalt_mutexattr *attr)
{
int synch_flags = XNSYNCH_PRIO | XNSYNCH_OWNER;
- struct xnsys_ppd *sys_ppd;
+ struct cobalt_ppd *sys_ppd;
struct cobalt_kqueues *kq;
spl_t s;
int err;
diff --git a/kernel/cobalt/posix/process.c b/kernel/cobalt/posix/process.c
index 6dc45d8..c79c8d7 100644
--- a/kernel/cobalt/posix/process.c
+++ b/kernel/cobalt/posix/process.c
@@ -642,7 +642,7 @@ int cobalt_map_user(struct xnthread *thread, __u32 __user
*u_winoff)
{
struct xnthread_user_window *u_window;
struct xnthread_start_attr attr;
- struct xnsys_ppd *sys_ppd;
+ struct cobalt_ppd *sys_ppd;
struct cobalt_umm *umm;
int ret;
@@ -722,13 +722,13 @@ static inline int handle_exception(struct ipipe_trap_data
*d)
trace_cobalt_thread_fault(thread, d);
if (xnarch_fault_fpu_p(d)) {
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
/* FPU exception received in primary mode. */
if (xnarch_handle_fpu_fault(sched->fpuholder, thread, d)) {
sched->fpuholder = thread;
return 1;
}
-#endif /* CONFIG_XENO_HW_FPU */
+#endif /* CONFIG_XENO_ARCH_FPU */
print_symbol("invalid use of FPU in Xenomai context at %s\n",
xnarch_fault_pc(d));
}
@@ -774,7 +774,7 @@ static int handle_mayday_event(struct pt_regs *regs)
{
struct xnthread *thread = xnthread_current();
struct xnarchtcb *tcb = xnthread_archtcb(thread);
- struct xnsys_ppd *sys_ppd;
+ struct cobalt_ppd *sys_ppd;
XENO_BUGON(COBALT, !xnthread_test_state(thread, XNUSER));
@@ -1042,7 +1042,7 @@ static inline void unlock_timers(void)
static int handle_taskexit_event(struct task_struct *p) /* p == current */
{
- struct xnsys_ppd *sys_ppd;
+ struct cobalt_ppd *sys_ppd;
struct xnthread *thread;
/*
@@ -1229,7 +1229,7 @@ static int handle_sigwake_event(struct task_struct *p)
static int handle_cleanup_event(struct mm_struct *mm)
{
struct cobalt_process *old, *process;
- struct xnsys_ppd *sys_ppd;
+ struct cobalt_ppd *sys_ppd;
struct xnthread *thread;
/*
@@ -1302,7 +1302,7 @@ int ipipe_kevent_hook(int kevent, void *data)
static int attach_process(struct cobalt_process *process)
{
- struct xnsys_ppd *p = &process->sys_ppd;
+ struct cobalt_ppd *p = &process->sys_ppd;
char *exe_path;
int ret;
@@ -1379,7 +1379,7 @@ static void *cobalt_process_attach(void)
static void detach_process(struct cobalt_process *process)
{
- struct xnsys_ppd *p = &process->sys_ppd;
+ struct cobalt_ppd *p = &process->sys_ppd;
if (p->exe_path)
kfree(p->exe_path);
diff --git a/kernel/cobalt/posix/process.h b/kernel/cobalt/posix/process.h
index 87be265..b0436d8 100644
--- a/kernel/cobalt/posix/process.h
+++ b/kernel/cobalt/posix/process.h
@@ -47,7 +47,7 @@ struct cobalt_kqueues {
struct cobalt_process {
struct mm_struct *mm;
struct hlist_node hlink;
- struct xnsys_ppd sys_ppd;
+ struct cobalt_ppd sys_ppd;
unsigned long permap;
struct cobalt_kqueues kqueues;
struct rb_root usems;
@@ -100,7 +100,7 @@ cobalt_set_process(struct cobalt_process *process)
return old;
}
-static inline struct xnsys_ppd *cobalt_ppd_get(int global)
+static inline struct cobalt_ppd *cobalt_ppd_get(int global)
{
struct cobalt_process *process;
diff --git a/kernel/cobalt/posix/sem.c b/kernel/cobalt/posix/sem.c
index e00e74d..331fae9 100644
--- a/kernel/cobalt/posix/sem.c
+++ b/kernel/cobalt/posix/sem.c
@@ -73,7 +73,7 @@ __cobalt_sem_init(const char *name, struct cobalt_sem_shadow
*sm,
{
struct cobalt_sem *sem, *osem;
struct cobalt_kqueues *kq;
- struct xnsys_ppd *sys_ppd;
+ struct cobalt_ppd *sys_ppd;
struct sem_dat *datp;
int ret, sflags;
spl_t s;
diff --git a/kernel/cobalt/rtdm/fd.c b/kernel/cobalt/rtdm/fd.c
index 8829c44..f75c7e5 100644
--- a/kernel/cobalt/rtdm/fd.c
+++ b/kernel/cobalt/rtdm/fd.c
@@ -56,7 +56,7 @@ static void nop_close(struct rtdm_fd *fd)
}
static inline struct rtdm_fd_index *
-fetch_fd_index(struct xnsys_ppd *p, int ufd)
+fetch_fd_index(struct cobalt_ppd *p, int ufd)
{
struct xnid *id = xnid_fetch(&p->fds, ufd);
if (id == NULL)
@@ -65,7 +65,7 @@ fetch_fd_index(struct xnsys_ppd *p, int ufd)
return container_of(id, struct rtdm_fd_index, id);
}
-static struct rtdm_fd *fetch_fd(struct xnsys_ppd *p, int ufd)
+static struct rtdm_fd *fetch_fd(struct cobalt_ppd *p, int ufd)
{
struct rtdm_fd_index *idx = fetch_fd_index(p, ufd);
if (idx == NULL)
@@ -119,7 +119,7 @@ int rtdm_fd_enter(struct rtdm_fd *fd, int ufd, unsigned int
magic,
struct rtdm_fd_ops *ops)
{
struct rtdm_fd_index *idx;
- struct xnsys_ppd *ppd;
+ struct cobalt_ppd *ppd;
spl_t s;
int ret;
@@ -176,7 +176,7 @@ int rtdm_fd_enter(struct rtdm_fd *fd, int ufd, unsigned int
magic,
*/
struct rtdm_fd *rtdm_fd_get(int ufd, unsigned int magic)
{
- struct xnsys_ppd *p = cobalt_ppd_get(0);
+ struct cobalt_ppd *p = cobalt_ppd_get(0);
struct rtdm_fd *fd;
spl_t s;
@@ -496,7 +496,7 @@ out:
EXPORT_SYMBOL_GPL(rtdm_fd_sendmsg);
static void
-__fd_close(struct xnsys_ppd *p, struct rtdm_fd_index *idx, spl_t s)
+__fd_close(struct cobalt_ppd *p, struct rtdm_fd_index *idx, spl_t s)
{
xnid_remove(&p->fds, &idx->id);
__put_fd(idx->fd, s);
@@ -507,7 +507,7 @@ __fd_close(struct xnsys_ppd *p, struct rtdm_fd_index *idx,
spl_t s)
int rtdm_fd_close(int ufd, unsigned int magic)
{
struct rtdm_fd_index *idx;
- struct xnsys_ppd *ppd;
+ struct cobalt_ppd *ppd;
struct rtdm_fd *fd;
spl_t s;
@@ -628,7 +628,7 @@ int rtdm_fd_select(int ufd, struct xnselector *selector,
static void destroy_fd(void *cookie, struct xnid *id)
{
- struct xnsys_ppd *p = cookie;
+ struct cobalt_ppd *p = cookie;
struct rtdm_fd_index *idx;
spl_t s;
@@ -637,7 +637,7 @@ static void destroy_fd(void *cookie, struct xnid *id)
__fd_close(p, idx, 0);
}
-void rtdm_fd_cleanup(struct xnsys_ppd *p)
+void rtdm_fd_cleanup(struct cobalt_ppd *p)
{
/*
* This is called on behalf of a (userland) task exit handler,
diff --git a/kernel/cobalt/sched.c b/kernel/cobalt/sched.c
index 2f8d277..6fdae55 100644
--- a/kernel/cobalt/sched.c
+++ b/kernel/cobalt/sched.c
@@ -202,9 +202,9 @@ void xnsched_init(struct xnsched *sched, int cpu)
xntimer_set_priority(&sched->rrbtimer, XNTIMER_LOPRIO);
xnstat_exectime_set_current(sched, &sched->rootcb.stat.account);
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
sched->fpuholder = &sched->rootcb;
-#endif /* CONFIG_XENO_HW_FPU */
+#endif /* CONFIG_XENO_ARCH_FPU */
xnthread_init_root_tcb(&sched->rootcb);
list_add_tail(&sched->rootcb.glink, &nkthreadq);
@@ -292,7 +292,7 @@ struct xnthread *xnsched_pick_next(struct xnsched *sched)
#endif /* CONFIG_XENO_OPT_SCHED_CLASSES */
}
-#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
+#ifdef CONFIG_XENO_ARCH_UNLOCKED_SWITCH
struct xnsched *xnsched_finish_unlocked_switch(struct xnsched *sched)
{
@@ -318,7 +318,7 @@ struct xnsched *xnsched_finish_unlocked_switch(struct
xnsched *sched)
return sched;
}
-#endif /* CONFIG_XENO_HW_UNLOCKED_SWITCH */
+#endif /* CONFIG_XENO_ARCH_UNLOCKED_SWITCH */
void ___xnsched_lock(struct xnsched *sched)
{
@@ -473,16 +473,16 @@ void xnsched_migrate(struct xnthread *thread, struct
xnsched *sched)
{
migrate_thread(thread, sched);
-#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
+#ifdef CONFIG_XENO_ARCH_UNLOCKED_SWITCH
/*
* Mark the thread in flight, xnsched_finish_unlocked_switch()
* will put the thread on the remote runqueue.
*/
xnthread_set_state(thread, XNMIGRATE);
-#else /* !CONFIG_XENO_HW_UNLOCKED_SWITCH */
+#else /* !CONFIG_XENO_ARCH_UNLOCKED_SWITCH */
/* Move thread to the remote runnable queue. */
xnsched_putback(thread);
-#endif /* !CONFIG_XENO_HW_UNLOCKED_SWITCH */
+#endif /* !CONFIG_XENO_ARCH_UNLOCKED_SWITCH */
}
/*
@@ -685,11 +685,11 @@ struct xnthread *xnsched_rt_pick(struct xnsched *sched)
static inline void switch_context(struct xnsched *sched,
struct xnthread *prev, struct xnthread *next)
{
-#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
+#ifdef CONFIG_XENO_ARCH_UNLOCKED_SWITCH
sched->last = prev;
sched->status |= XNINSW;
xnlock_clear_irqon(&nklock);
-#endif /* !CONFIG_XENO_HW_UNLOCKED_SWITCH */
+#endif /* !CONFIG_XENO_ARCH_UNLOCKED_SWITCH */
xnarch_switch_to(prev, next);
}
@@ -764,7 +764,7 @@ static inline void enter_root(struct xnthread *root)
{
struct xnarchtcb *rootcb __maybe_unused = xnthread_archtcb(root);
-#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
+#ifdef CONFIG_XENO_ARCH_UNLOCKED_SWITCH
if (rootcb->core.mm == NULL)
set_ti_thread_flag(rootcb->core.tip, TIF_MMSWITCH_INT);
#endif
@@ -782,7 +782,7 @@ static inline void leave_root(struct xnthread *root)
rootcb->core.host_task = p;
rootcb->core.tsp = &p->thread;
rootcb->core.mm = rootcb->core.active_mm = ipipe_get_active_mm();
-#ifdef CONFIG_XENO_HW_WANT_TIP
+#ifdef CONFIG_XENO_ARCH_WANT_TIP
rootcb->core.tip = task_thread_info(p);
#endif
xnarch_leave_root(root);
diff --git a/kernel/cobalt/thread.c b/kernel/cobalt/thread.c
index f44bfe0..aec4970 100644
--- a/kernel/cobalt/thread.c
+++ b/kernel/cobalt/thread.c
@@ -148,7 +148,7 @@ int __xnthread_init(struct xnthread *thread,
spl_t s;
flags &= ~XNSUSP;
-#ifndef CONFIG_XENO_HW_FPU
+#ifndef CONFIG_XENO_ARCH_FPU
flags &= ~XNFPU;
#endif
if (flags & XNROOT)
@@ -231,12 +231,12 @@ void xnthread_init_shadow_tcb(struct xnthread *thread,
struct task_struct *task)
tcb->core.tsp = &task->thread;
tcb->core.mm = task->mm;
tcb->core.active_mm = task->mm;
-#ifdef CONFIG_XENO_HW_WANT_TIP
+#ifdef CONFIG_XENO_ARCH_WANT_TIP
tcb->core.tip = task_thread_info(task);
#endif
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
tcb->core.user_fpu_owner = task;
-#endif /* CONFIG_XENO_HW_FPU */
+#endif /* CONFIG_XENO_ARCH_FPU */
xnarch_init_shadow_tcb(thread);
}
@@ -248,7 +248,7 @@ void xnthread_init_root_tcb(struct xnthread *thread)
tcb->core.host_task = current;
tcb->core.tsp = &tcb->core.ts;
tcb->core.mm = current->mm;
-#ifdef CONFIG_XENO_HW_WANT_TIP
+#ifdef CONFIG_XENO_ARCH_WANT_TIP
tcb->core.tip = NULL;
#endif
xnarch_init_root_tcb(thread);
@@ -362,7 +362,7 @@ EXPORT_SYMBOL_GPL(xnthread_prepare_wait);
static inline int moving_target(struct xnsched *sched, struct xnthread *thread)
{
int ret = 0;
-#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
+#ifdef CONFIG_XENO_ARCH_UNLOCKED_SWITCH
/*
* When deleting a thread in the course of a context switch or
* in flight to another CPU with nklock unlocked on a distant
@@ -375,7 +375,7 @@ static inline int moving_target(struct xnsched *sched,
struct xnthread *thread)
return ret;
}
-#ifdef CONFIG_XENO_HW_FPU
+#ifdef CONFIG_XENO_ARCH_FPU
static inline void giveup_fpu(struct xnsched *sched,
struct xnthread *thread)
@@ -408,7 +408,7 @@ void xnthread_switch_fpu(struct xnsched *sched)
sched->fpuholder = curr;
}
-#else /* !CONFIG_XENO_HW_FPU */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void giveup_fpu(struct xnsched *sched,
struct xnthread *thread)
@@ -419,7 +419,7 @@ static inline void release_fpu(struct xnthread *thread)
{
}
-#endif /* !CONFIG_XENO_HW_FPU */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void cleanup_tcb(struct xnthread *thread) /* nklock held, irqs
off */
{
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
