X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=kerncompat.h;h=fa96715fb70cef75e8c95603f5034a39d57a268e;hb=0155481cc91285c75992603dfa6204a4fb6b698d;hp=1493cad85bdad2e23b9d5dcfee3b7d59cdfa8c27;hpb=6b62b7647041d1b42c8e899d6f104805b93dad49;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/kerncompat.h b/kerncompat.h
index 1493cad..fa96715 100644
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -299,6 +299,9 @@ static inline void assert_trace(const char *assertion, const char *filename,
 	fprintf(stderr,
 		"%s:%d: %s: Assertion `%s` failed, value %ld\n",
 		filename, line, func, assertion, val);
+#ifndef BTRFS_DISABLE_BACKTRACE
+	print_trace();
+#endif
 	abort();
 	exit(1);
 }
@@ -314,11 +317,13 @@ static inline void assert_trace(const char *assertion, const char *filename,
 #define container_of(ptr, type, member) ({                      \
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
 	        (type *)( (char *)__mptr - offsetof(type,member) );})
+#ifndef __bitwise
 #ifdef __CHECKER__
 #define __bitwise __bitwise__
 #else
 #define __bitwise
-#endif
+#endif /* __CHECKER__ */
+#endif	/* __bitwise */
 
 /* Alignment check */
 #define IS_ALIGNED(x, a)                (((x) & ((typeof(x))(a) - 1)) == 0)