Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-ubi

Browse source
This commit is contained in:
Tom Rini 2019-04-09 12:10:53 -04:00
commit 4c24dab391
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/mtd/ubi/debug.h
View file

@ -18,6 +18,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
#include <hexdump.h>
#ifndef __UBOOT__
#define ubi_assert(expr) do { \
if (unlikely(!(expr))) { \
pr_crit("UBI assert failed in %s at %u (pid %d)\n", \
@ -25,6 +26,15 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
dump_stack(); \
} \
} while (0)
#else
#define ubi_assert(expr) do { \
if (unlikely(!(expr))) { \
pr_debug("UBI assert failed in %s at %u\n", \
__func__, __LINE__); \
dump_stack(); \
} \
} while (0)
#endif
#define ubi_dbg_print_hex_dump(ps, pt, r, g, b, len, a) \
print_hex_dump(ps, pt, r, g, b, len, a)

4
fs/ubifs/debug.h
View file

@ -167,7 +167,7 @@ struct ubifs_global_debug_info {
#else
#define ubifs_assert(expr) do { \
if (unlikely(!(expr))) { \
pr_crit("UBIFS assert failed in %s at %u\n", \
pr_debug("UBIFS assert failed in %s at %u\n", \
__func__, __LINE__); \
dump_stack(); \
} \
@ -176,7 +176,7 @@ struct ubifs_global_debug_info {
#define ubifs_assert_cmt_locked(c) do { \
if (unlikely(down_write_trylock(&(c)->commit_sem))) { \
up_write(&(c)->commit_sem); \
pr_crit("commit lock is not locked!\n"); \
pr_debug("commit lock is not locked!\n"); \
ubifs_assert(0); \
} \
} while (0)