Module: xenomai-3
Branch: next
Commit: 1a07907c1732b557a486b82653d52ace066779e8
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=1a07907c1732b557a486b82653d52ace066779e8
Author: Philippe Gerum <r...@xenomai.org>
Date: Sun Feb 15 19:07:41 2015 +0100
cobalt/kernel: unify naming of extern data - cobalt_kernel_ppd
---
include/cobalt/kernel/ppd.h | 2 +-
include/cobalt/kernel/rtdm/driver.h | 2 +-
kernel/cobalt/init.c | 4 ++--
kernel/cobalt/posix/memory.c | 16 ++++++++--------
kernel/cobalt/posix/mqueue.c | 2 +-
kernel/cobalt/posix/process.c | 2 +-
kernel/cobalt/posix/process.h | 2 +-
kernel/cobalt/rtdm/fd.c | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/include/cobalt/kernel/ppd.h b/include/cobalt/kernel/ppd.h
index d5cfc69..5eabd1d 100644
--- a/include/cobalt/kernel/ppd.h
+++ b/include/cobalt/kernel/ppd.h
@@ -38,6 +38,6 @@ struct cobalt_ppd {
struct rb_root fds;
};
-extern struct cobalt_ppd __xnsys_global_ppd;
+extern struct cobalt_ppd cobalt_kernel_ppd;
#endif /* _COBALT_KERNEL_PPD_H */
diff --git a/include/cobalt/kernel/rtdm/driver.h
b/include/cobalt/kernel/rtdm/driver.h
index 4dcb0c0..6faa8bd 100644
--- a/include/cobalt/kernel/rtdm/driver.h
+++ b/include/cobalt/kernel/rtdm/driver.h
@@ -185,7 +185,7 @@ static inline struct rtdm_fd *rtdm_private_to_fd(void
*dev_private)
*/
static inline bool rtdm_fd_is_user(struct rtdm_fd *fd)
{
- return rtdm_fd_owner(fd) != &__xnsys_global_ppd;
+ return rtdm_fd_owner(fd) != &cobalt_kernel_ppd;
}
/**
diff --git a/kernel/cobalt/init.c b/kernel/cobalt/init.c
index 3948c8d..65dc042 100644
--- a/kernel/cobalt/init.c
+++ b/kernel/cobalt/init.c
@@ -72,10 +72,10 @@ EXPORT_PER_CPU_SYMBOL_GPL(xnarch_percpu_machdata);
atomic_t cobalt_runstate = ATOMIC_INIT(COBALT_STATE_WARMUP);
EXPORT_SYMBOL_GPL(cobalt_runstate);
-struct cobalt_ppd __xnsys_global_ppd = {
+struct cobalt_ppd cobalt_kernel_ppd = {
.exe_path = "vmlinux",
};
-EXPORT_SYMBOL_GPL(__xnsys_global_ppd);
+EXPORT_SYMBOL_GPL(cobalt_kernel_ppd);
#ifdef CONFIG_XENO_OPT_DEBUG
#define boot_debug_notice "[DEBUG]"
diff --git a/kernel/cobalt/posix/memory.c b/kernel/cobalt/posix/memory.c
index 6ca9206..efedfa2 100644
--- a/kernel/cobalt/posix/memory.c
+++ b/kernel/cobalt/posix/memory.c
@@ -64,7 +64,7 @@ static struct cobalt_umm *umm_from_fd(struct rtdm_fd *fd)
if (rtdm_fd_minor(fd) == UMM_PRIVATE)
return &process->sys_ppd.umm;
- return &__xnsys_global_ppd.umm;
+ return &cobalt_kernel_ppd.umm;
}
static int umm_mmap(struct rtdm_fd *fd, struct vm_area_struct *vma)
@@ -262,14 +262,14 @@ int cobalt_memdev_init(void)
{
int ret;
- ret = cobalt_umm_init(&__xnsys_global_ppd.umm,
+ ret = cobalt_umm_init(&cobalt_kernel_ppd.umm,
CONFIG_XENO_OPT_SHARED_HEAPSZ * 1024, NULL);
if (ret)
return ret;
- cobalt_umm_set_name(&__xnsys_global_ppd.umm, "shared heap");
+ cobalt_umm_set_name(&cobalt_kernel_ppd.umm, "shared heap");
- nkvdso = cobalt_umm_alloc(&__xnsys_global_ppd.umm, sizeof(*nkvdso));
+ nkvdso = cobalt_umm_alloc(&cobalt_kernel_ppd.umm, sizeof(*nkvdso));
if (nkvdso == NULL) {
ret = -ENOMEM;
goto fail_vdso;
@@ -296,9 +296,9 @@ fail_sysmem:
fail_shared:
rtdm_dev_unregister(umm_devices + UMM_PRIVATE);
fail_private:
- cobalt_umm_free(&__xnsys_global_ppd.umm, nkvdso);
+ cobalt_umm_free(&cobalt_kernel_ppd.umm, nkvdso);
fail_vdso:
- cobalt_umm_destroy(&__xnsys_global_ppd.umm);
+ cobalt_umm_destroy(&cobalt_kernel_ppd.umm);
return ret;
}
@@ -308,8 +308,8 @@ void cobalt_memdev_cleanup(void)
rtdm_dev_unregister(&sysmem_device);
rtdm_dev_unregister(umm_devices + UMM_SHARED);
rtdm_dev_unregister(umm_devices + UMM_PRIVATE);
- cobalt_umm_free(&__xnsys_global_ppd.umm, nkvdso);
- cobalt_umm_destroy(&__xnsys_global_ppd.umm);
+ cobalt_umm_free(&cobalt_kernel_ppd.umm, nkvdso);
+ cobalt_umm_destroy(&cobalt_kernel_ppd.umm);
}
int cobalt_umm_init(struct cobalt_umm *umm, u32 size,
diff --git a/kernel/cobalt/posix/mqueue.c b/kernel/cobalt/posix/mqueue.c
index 53c7e95..66ec415 100644
--- a/kernel/cobalt/posix/mqueue.c
+++ b/kernel/cobalt/posix/mqueue.c
@@ -267,7 +267,7 @@ static inline int mqd_create(struct cobalt_mq *mq, unsigned
long flags, int ufd)
{
struct cobalt_mqd *mqd;
- if (cobalt_ppd_get(0) == &__xnsys_global_ppd)
+ if (cobalt_ppd_get(0) == &cobalt_kernel_ppd)
return -EPERM;
mqd = kmalloc(sizeof(*mqd), GFP_KERNEL);
diff --git a/kernel/cobalt/posix/process.c b/kernel/cobalt/posix/process.c
index 39f4e26..8c59531 100644
--- a/kernel/cobalt/posix/process.c
+++ b/kernel/cobalt/posix/process.c
@@ -1190,7 +1190,7 @@ static int handle_cleanup_event(struct mm_struct *mm)
process = cobalt_search_process(mm);
old = cobalt_set_process(process);
sys_ppd = cobalt_ppd_get(0);
- if (sys_ppd != &__xnsys_global_ppd) {
+ if (sys_ppd != &cobalt_kernel_ppd) {
/*
* Detect a userland shadow running exec(), i.e. still
* attached to the current linux task (no prior
diff --git a/kernel/cobalt/posix/process.h b/kernel/cobalt/posix/process.h
index b0436d8..7f78345 100644
--- a/kernel/cobalt/posix/process.h
+++ b/kernel/cobalt/posix/process.h
@@ -105,7 +105,7 @@ static inline struct cobalt_ppd *cobalt_ppd_get(int global)
struct cobalt_process *process;
if (global || (process = cobalt_current_process()) == NULL)
- return &__xnsys_global_ppd;
+ return &cobalt_kernel_ppd;
return &process->sys_ppd;
}
diff --git a/kernel/cobalt/rtdm/fd.c b/kernel/cobalt/rtdm/fd.c
index 7e4e99a..95d8120 100644
--- a/kernel/cobalt/rtdm/fd.c
+++ b/kernel/cobalt/rtdm/fd.c
@@ -124,7 +124,7 @@ static inline void set_compat_bit(struct rtdm_fd *fd)
{
struct pt_regs *regs;
- if (cobalt_ppd_get(0) == &__xnsys_global_ppd)
+ if (cobalt_ppd_get(0) == &cobalt_kernel_ppd)
fd->compat = 0;
else {
regs = task_pt_regs(current);
diff --git a/utils/net/rtnet.in b/utils/net/rtnet.in
old mode 100755
new mode 100644
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
