Module: xenomai-3 Branch: next Commit: d1f46a3ff8d557922819d35d7f176499148b6760 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=d1f46a3ff8d557922819d35d7f176499148b6760
Author: Philippe Gerum <r...@xenomai.org> Date: Tue Feb 17 11:56:05 2015 +0100 cobalt/kernel: unify naming of extern data - cobalt_debug_vfroot --- kernel/cobalt/debug.c | 6 +++--- kernel/cobalt/debug.h | 2 +- kernel/cobalt/procfs.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/cobalt/debug.c b/kernel/cobalt/debug.c index 5783b0c..8cd32b3 100644 --- a/kernel/cobalt/debug.c +++ b/kernel/cobalt/debug.c @@ -37,8 +37,8 @@ * @defgroup cobalt_core_debug Debugging services * @{ */ -struct xnvfile_directory debug_vfroot; -EXPORT_SYMBOL_GPL(debug_vfroot); +struct xnvfile_directory cobalt_debug_vfroot; +EXPORT_SYMBOL_GPL(cobalt_debug_vfroot); #ifdef CONFIG_XENO_OPT_DEBUG_TRACE_RELAX @@ -498,7 +498,7 @@ static inline int init_trace_relax(void) xnheap_set_name(&memory_pool, "debug log"); - ret = xnvfile_init_regular("relax", &relax_vfile, &debug_vfroot); + ret = xnvfile_init_regular("relax", &relax_vfile, &cobalt_debug_vfroot); if (ret) { xnheap_destroy(&memory_pool); vfree(p); diff --git a/kernel/cobalt/debug.h b/kernel/cobalt/debug.h index 2af4fcb..24dc354 100644 --- a/kernel/cobalt/debug.h +++ b/kernel/cobalt/debug.h @@ -32,7 +32,7 @@ void xndebug_cleanup(void); void xndebug_shadow_init(struct xnthread *thread); -extern struct xnvfile_directory debug_vfroot; +extern struct xnvfile_directory cobalt_debug_vfroot; #else /* !XENO_OPT_DEBUG */ diff --git a/kernel/cobalt/procfs.c b/kernel/cobalt/procfs.c index cc1cad4..2c9342d 100644 --- a/kernel/cobalt/procfs.c +++ b/kernel/cobalt/procfs.c @@ -219,7 +219,7 @@ void xnprocfs_cleanup_tree(void) #if XENO_DEBUG(LOCKING) xnvfile_destroy_regular(&lock_vfile); #endif - xnvfile_destroy_dir(&debug_vfroot); + xnvfile_destroy_dir(&cobalt_debug_vfroot); #endif /* XENO_DEBUG(COBALT) */ xnvfile_destroy_regular(&apc_vfile); xnvfile_destroy_regular(&faults_vfile); @@ -252,9 +252,9 @@ int __init xnprocfs_init_tree(void) 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, &cobalt_vfroot); + xnvfile_init_dir("debug", &cobalt_debug_vfroot, &cobalt_vfroot); #if XENO_DEBUG(LOCKING) - xnvfile_init_regular("lock", &lock_vfile, &debug_vfroot); + xnvfile_init_regular("lock", &lock_vfile, &cobalt_debug_vfroot); #endif #endif /* XENO_DEBUG(COBALT) */ _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git