From: Keir Fraser <keir@xen.org>
Date: Tue, 18 Jan 2011 12:25:16 +0000 (+0000)
Subject: xen: stringify assertion condition for printing sooner.
X-Git-Tag: 4.0.2-rc2~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=189030682de726203bce15097a70a249c542f036;p=people%2Fvhanquez%2Fxen.git

xen: stringify assertion condition for printing sooner.

So that:
(XEN) Assertion '!(((*({ unsigned long __ptr; __asm__ ("" :
"=r"(__ptr) : "0"(&per_cpu____preempt_count));
(typeof(&per_cpu____preempt_count)) (__ptr +
(get_cpu_info()->per_cpu_offset)); }))) ||
((irq_stat[(((get_cpu_info()->processor_id)1...
becomes:
(XEN) Assertion '"!in_atomic()"' failed at softirq.c:61

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
xen-unstable changeset:   22774:96441daf4a5b
xen-unstable date:        Tue Jan 18 09:01:57 2011 +0000
---

diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h
index 60efca224..05083e016 100644
--- a/xen/include/asm-x86/bug.h
+++ b/xen/include/asm-x86/bug.h
@@ -40,7 +40,7 @@ struct bug_frame {
     asm volatile (                                 \
         "ud2 ; ret %0" BUG_STR(1) BUG_STR(2)       \
         : : "i" (BUGFRAME_assert | (__LINE__<<2)), \
-            "i" (__FILE__), "i" (#p) )
+            "i" (__FILE__), "i" (p) )
 
 
 #endif /* __X86_BUG_H__ */
diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index d21e8dd5c..5adddb4cb 100644
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -27,7 +27,7 @@ void __warn(char *file, int line);
 #ifndef assert_failed
 #define assert_failed(p)                                        \
 do {                                                            \
-    printk("Assertion '%s' failed, line %d, file %s\n", #p ,    \
+    printk("Assertion '%s' failed, line %d, file %s\n", p ,     \
                    __LINE__, __FILE__);                         \
     BUG();                                                      \
 } while (0)
@@ -35,7 +35,7 @@ do {                                                            \
 
 #ifndef NDEBUG
 #define ASSERT(p) \
-    do { if ( unlikely(!(p)) ) assert_failed(p); } while (0)
+    do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0)
 #else
 #define ASSERT(p) ((void)0)
 #endif