Module: xenomai-forge
Branch: next
Commit: cc076eb5064c10866f7911bbc1b335aae5171c1f
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=cc076eb5064c10866f7911bbc1b335aae5171c1f

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sun Jul 28 17:32:01 2013 +0200

cobalt/kernel: use Xenomai console level prefixes

---

 kernel/cobalt/debug.c  |   11 +++++------
 kernel/cobalt/heap.c   |    2 +-
 kernel/cobalt/init.c   |    2 +-
 kernel/cobalt/pod.c    |    2 +-
 kernel/cobalt/shadow.c |   13 ++++++-------
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/kernel/cobalt/debug.c b/kernel/cobalt/debug.c
index d79f256..3b0d5c0 100644
--- a/kernel/cobalt/debug.c
+++ b/kernel/cobalt/debug.c
@@ -548,9 +548,9 @@ void xnlock_dbg_spinning(struct xnlock *lock, int cpu,
 {
        if (--*spin_limit == 0) {
                ipipe_prepare_panic();
-               printk(KERN_ERR "Xenomai: stuck on lock %p\n"
-                               "         waiter = %s:%u (%s(), CPU #%d)\n"
-                               "         owner  = %s:%u (%s(), CPU #%d)\n",
+               printk(XENO_ERR "stuck on lock %p\n"
+                               "           waiter = %s:%u (%s(), CPU #%d)\n"
+                               "           owner  = %s:%u (%s(), CPU #%d)\n",
                       lock, file, line, function, cpu,
                       lock->file, lock->line, lock->function, lock->cpu);
                show_stack(NULL, NULL);
@@ -592,9 +592,8 @@ int xnlock_dbg_release(struct xnlock *lock,
 
        if (unlikely(atomic_read(&lock->owner) != cpu)) {
                ipipe_prepare_panic();
-               printk(KERN_ERR "Xenomai: lock %p already unlocked"
-                               " on CPU #%d\n"
-                               "         last owner = %s:%u (%s(), CPU #%d)\n",
+               printk(XENO_ERR "lock %p already unlocked on CPU #%d\n"
+                               "          last owner = %s:%u (%s(), CPU 
#%d)\n",
                       lock, cpu, lock->file, lock->line, lock->function,
                       lock->cpu);
                show_stack(NULL,NULL);
diff --git a/kernel/cobalt/heap.c b/kernel/cobalt/heap.c
index b98428c..a8aba3a 100644
--- a/kernel/cobalt/heap.c
+++ b/kernel/cobalt/heap.c
@@ -1403,7 +1403,7 @@ void xnheap_destroy_mapped(struct xnheap *heap,
        XENO_ASSERT(NUCLEUS, mapaddr == NULL || release, /* nop */);
 
        if (XENO_DEBUG(NUCLEUS) && heap->ubytes != 0)
-               printk(KERN_ERR "xnheap: destroying shared heap '%s' "
+               printk(XENO_ERR "destroying shared heap '%s' "
                       "with %lu bytes still in use.\n",
                       heap->label, heap->ubytes);
 
diff --git a/kernel/cobalt/init.c b/kernel/cobalt/init.c
index ac8a8ad..0e04cf2 100644
--- a/kernel/cobalt/init.c
+++ b/kernel/cobalt/init.c
@@ -100,7 +100,7 @@ static int __init mach_setup(void)
                clockfreq_arg = sysinfo.sys_hrclock_freq;
 
        if (clockfreq_arg == 0) {
-               printk(KERN_ERR "Xenomai: null clock frequency? Aborting.\n");
+               printk(XENO_ERR "null clock frequency? Aborting.\n");
                return -ENODEV;
        }
 
diff --git a/kernel/cobalt/pod.c b/kernel/cobalt/pod.c
index 7b94d2a..5110841 100644
--- a/kernel/cobalt/pod.c
+++ b/kernel/cobalt/pod.c
@@ -162,7 +162,7 @@ void xnpod_fatal(const char *format, ...)
 
        va_start(ap, format);
        vsnprintf(msg_buf, sizeof(msg_buf), format, ap);
-       printk(KERN_ERR "%s", msg_buf);
+       printk(XENO_ERR "%s", msg_buf);
        va_end(ap);
 
        if (!xnpod_active_p() || xnpod_fatal_p())
diff --git a/kernel/cobalt/shadow.c b/kernel/cobalt/shadow.c
index 4413730..4616c8f 100644
--- a/kernel/cobalt/shadow.c
+++ b/kernel/cobalt/shadow.c
@@ -1192,8 +1192,7 @@ static int xnshadow_sys_mayday(void)
                return __xn_reg_rval(cur->regs);
        }
 
-       printk(KERN_WARNING
-              "Xenomai: MAYDAY received from invalid context %s[%d]\n",
+       printk(XENO_WARN "MAYDAY received from invalid context %s[%d]\n",
               current->comm, current->pid);
 
        return -EPERM;
@@ -1203,7 +1202,7 @@ static inline int mayday_init_page(void)
 {
        mayday_page = vmalloc(PAGE_SIZE);
        if (mayday_page == NULL) {
-               printk(KERN_ERR "Xenomai: can't alloc MAYDAY page\n");
+               printk(XENO_ERR "can't alloc MAYDAY page\n");
                return -ENOMEM;
        }
 
@@ -1621,8 +1620,8 @@ static struct xnshadow_ppd *user_process_attach(void)
 
        p->mayday_addr = map_mayday_page(current);
        if (p->mayday_addr == 0) {
-               printk(KERN_WARNING
-                      "Xenomai: %s[%d] cannot map MAYDAY page\n",
+               printk(XENO_WARN
+                      "%s[%d] cannot map MAYDAY page\n",
                       current->comm, current->pid);
                kfree(p);
                return ERR_PTR(-ENOMEM);
@@ -1630,8 +1629,8 @@ static struct xnshadow_ppd *user_process_attach(void)
 
        exe_path = get_exe_path(current);
        if (IS_ERR(exe_path)) {
-               printk(KERN_WARNING
-                      "Xenomai: %s[%d] can't find exe path\n",
+               printk(XENO_WARN
+                      "%s[%d] can't find exe path\n",
                       current->comm, current->pid);
                exe_path = NULL; /* Not lethal, but weird. */
        }


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

Reply via email to