Module: xenomai-3
Branch: master
Commit: cb78d1e15b1b26abdb0e5c18988d6750fa599761
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=cb78d1e15b1b26abdb0e5c18988d6750fa599761

Author: Philippe Gerum <r...@xenomai.org>
Date:   Tue Feb 17 11:53:03 2015 +0100

cobalt/kernel: unify naming of extern data - cobalt_vfroot

---

 include/cobalt/kernel/vfile.h |    2 +-
 kernel/cobalt/clock.c         |    4 ++--
 kernel/cobalt/heap.c          |    2 +-
 kernel/cobalt/intr.c          |    2 +-
 kernel/cobalt/procfs.c        |   10 +++++-----
 kernel/cobalt/registry.c      |    2 +-
 kernel/cobalt/sched.c         |    4 ++--
 kernel/cobalt/vfile.c         |   18 +++++++++---------
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/include/cobalt/kernel/vfile.h b/include/cobalt/kernel/vfile.h
index 8618600..a53c237 100644
--- a/include/cobalt/kernel/vfile.h
+++ b/include/cobalt/kernel/vfile.h
@@ -584,7 +584,7 @@ static inline void xnvfile_touch(struct xnvfile_snapshot 
*vfile)
 
 extern struct xnvfile_nklock_class xnvfile_nucleus_lock;
 
-extern struct xnvfile_directory nkvfroot;
+extern struct xnvfile_directory cobalt_vfroot;
 
 int xnvfile_init_root(void);
 
diff --git a/kernel/cobalt/clock.c b/kernel/cobalt/clock.c
index 31b6fae..24cb9a4 100644
--- a/kernel/cobalt/clock.c
+++ b/kernel/cobalt/clock.c
@@ -443,7 +443,7 @@ static void cleanup_timerlist_proc(struct xnclock *clock)
 
 void init_timerlist_root(void)
 {
-       xnvfile_init_dir("timer", &timerlist_vfroot, &nkvfroot);
+       xnvfile_init_dir("timer", &timerlist_vfroot, &cobalt_vfroot);
 }
 
 void cleanup_timerlist_root(void)
@@ -567,7 +567,7 @@ static void cleanup_clock_proc(struct xnclock *clock)
 
 void xnclock_init_proc(void)
 {
-       xnvfile_init_dir("clock", &clock_vfroot, &nkvfroot);
+       xnvfile_init_dir("clock", &clock_vfroot, &cobalt_vfroot);
        init_timerlist_root();
 }
 
diff --git a/kernel/cobalt/heap.c b/kernel/cobalt/heap.c
index 359b74f..6c9fdb0 100644
--- a/kernel/cobalt/heap.c
+++ b/kernel/cobalt/heap.c
@@ -127,7 +127,7 @@ static struct xnvfile_snapshot_ops vfile_ops = {
 
 void xnheap_init_proc(void)
 {
-       xnvfile_init_snapshot("heap", &vfile, &nkvfroot);
+       xnvfile_init_snapshot("heap", &vfile, &cobalt_vfroot);
 }
 
 void xnheap_cleanup_proc(void)
diff --git a/kernel/cobalt/intr.c b/kernel/cobalt/intr.c
index dc66700..a9c1024 100644
--- a/kernel/cobalt/intr.c
+++ b/kernel/cobalt/intr.c
@@ -1155,7 +1155,7 @@ static struct xnvfile_regular irq_vfile = {
 
 void xnintr_init_proc(void)
 {
-       xnvfile_init_regular("irq", &irq_vfile, &nkvfroot);
+       xnvfile_init_regular("irq", &irq_vfile, &cobalt_vfroot);
 }
 
 void xnintr_cleanup_proc(void)
diff --git a/kernel/cobalt/procfs.c b/kernel/cobalt/procfs.c
index 345b0a9..cc1cad4 100644
--- a/kernel/cobalt/procfs.c
+++ b/kernel/cobalt/procfs.c
@@ -247,12 +247,12 @@ int __init xnprocfs_init_tree(void)
        xnclock_init_proc();
        xnheap_init_proc();
        xnintr_init_proc();
-       xnvfile_init_regular("latency", &latency_vfile, &nkvfroot);
-       xnvfile_init_regular("version", &version_vfile, &nkvfroot);
-       xnvfile_init_regular("faults", &faults_vfile, &nkvfroot);
-       xnvfile_init_regular("apc", &apc_vfile, &nkvfroot);
+       xnvfile_init_regular("latency", &latency_vfile, &cobalt_vfroot);
+       xnvfile_init_regular("version", &version_vfile, &cobalt_vfroot);
+       xnvfile_init_regular("faults", &faults_vfile, &cobalt_vfroot);
+       xnvfile_init_regular("apc", &apc_vfile, &cobalt_vfroot);
 #ifdef CONFIG_XENO_OPT_DEBUG
-       xnvfile_init_dir("debug", &debug_vfroot, &nkvfroot);
+       xnvfile_init_dir("debug", &debug_vfroot, &cobalt_vfroot);
 #if XENO_DEBUG(LOCKING)
        xnvfile_init_regular("lock", &lock_vfile, &debug_vfroot);
 #endif
diff --git a/kernel/cobalt/registry.c b/kernel/cobalt/registry.c
index 30cf814..ba46bd0 100644
--- a/kernel/cobalt/registry.c
+++ b/kernel/cobalt/registry.c
@@ -114,7 +114,7 @@ int xnregistry_init(void)
                return -ENOMEM;
 
 #ifdef CONFIG_XENO_OPT_VFILE
-       ret = xnvfile_init_dir("registry", &registry_vfroot, &nkvfroot);
+       ret = xnvfile_init_dir("registry", &registry_vfroot, &cobalt_vfroot);
        if (ret)
                return ret;
 
diff --git a/kernel/cobalt/sched.c b/kernel/cobalt/sched.c
index 5f048c4..f828da4 100644
--- a/kernel/cobalt/sched.c
+++ b/kernel/cobalt/sched.c
@@ -1346,7 +1346,7 @@ int xnsched_init_proc(void)
        struct xnsched_class *p;
        int ret;
 
-       ret = xnvfile_init_dir("sched", &sched_vfroot, &nkvfroot);
+       ret = xnvfile_init_dir("sched", &sched_vfroot, &cobalt_vfroot);
        if (ret)
                return ret;
 
@@ -1372,7 +1372,7 @@ int xnsched_init_proc(void)
 #endif /* CONFIG_XENO_OPT_STATS */
 
 #ifdef CONFIG_SMP
-       xnvfile_init_regular("affinity", &affinity_vfile, &nkvfroot);
+       xnvfile_init_regular("affinity", &affinity_vfile, &cobalt_vfroot);
 #endif /* CONFIG_SMP */
 
        return 0;
diff --git a/kernel/cobalt/vfile.c b/kernel/cobalt/vfile.c
index 553b4c0..427e167 100644
--- a/kernel/cobalt/vfile.c
+++ b/kernel/cobalt/vfile.c
@@ -79,14 +79,14 @@
  *@{*/
 
 /**
- * @var struct xnvfile_directory nkvfroot
+ * @var struct xnvfile_directory cobalt_vfroot
  * @brief Xenomai vfile root directory
  *
  * This vdir maps the /proc/xenomai directory. It can be used to
  * create a hierarchy of Xenomai-related vfiles under this root.
  */
-struct xnvfile_directory nkvfroot;
-EXPORT_SYMBOL_GPL(nkvfroot);
+struct xnvfile_directory cobalt_vfroot;
+EXPORT_SYMBOL_GPL(cobalt_vfroot);
 
 static struct xnvfile_directory sysroot;
 
@@ -384,7 +384,7 @@ static struct file_operations vfile_snapshot_fops = {
  * @param parent A pointer to a virtual directory descriptor; the
  * vfile entry will be created into this directory. If NULL, the /proc
  * root directory will be used. /proc/xenomai is mapped on the
- * globally available @a nkvfroot vdir.
+ * globally available @a cobalt_vfroot vdir.
  *
  * @return 0 is returned on success. Otherwise:
  *
@@ -623,7 +623,7 @@ static struct file_operations vfile_regular_fops = {
  * @param parent A pointer to a virtual directory descriptor; the
  * vfile entry will be created into this directory. If NULL, the /proc
  * root directory will be used. /proc/xenomai is mapped on the
- * globally available @a nkvfroot vdir.
+ * globally available @a cobalt_vfroot vdir.
  *
  * @return 0 is returned on success. Otherwise:
  *
@@ -667,7 +667,7 @@ EXPORT_SYMBOL_GPL(xnvfile_init_regular);
  * @param parent A pointer to a virtual directory descriptor standing
  * for the parent directory of the new vdir.  If NULL, the /proc root
  * directory will be used. /proc/xenomai is mapped on the globally
- * available @a nkvfroot vdir.
+ * available @a cobalt_vfroot vdir.
  *
  * @return 0 is returned on success. Otherwise:
  *
@@ -714,7 +714,7 @@ EXPORT_SYMBOL_GPL(xnvfile_init_dir);
  * @param parent A pointer to a virtual directory descriptor standing
  * for the parent directory of the new vlink. If NULL, the /proc root
  * directory will be used. /proc/xenomai is mapped on the globally
- * available @a nkvfroot vdir.
+ * available @a cobalt_vfroot vdir.
  *
  * @return 0 is returned on success. Otherwise:
  *
@@ -957,7 +957,7 @@ struct xnvfile_nklock_class xnvfile_nucleus_lock = {
 
 int __init xnvfile_init_root(void)
 {
-       struct xnvfile_directory *vdir = &nkvfroot;
+       struct xnvfile_directory *vdir = &cobalt_vfroot;
        struct proc_dir_entry *pde;
 
        pde = proc_mkdir("xenomai", NULL);
@@ -973,7 +973,7 @@ int __init xnvfile_init_root(void)
 
 void xnvfile_destroy_root(void)
 {
-       nkvfroot.entry.pde = NULL;
+       cobalt_vfroot.entry.pde = NULL;
        remove_proc_entry("xenomai", NULL);
 }
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to