qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: mtd: ubi debug: Remove the pid print from ubi_assert 

Add a new definition for ubi_assert and keep
the original one in an ifndef __UBOOT__.

Change-Id: I73cb2a932ad46bffffdce86250d4e08940d0aed9
Signed-off-by: Eran Matityahu <eran.m@variscite.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 66e78fc196f59a9cd2688effa4d4d2eea32b0ed5)
This commit is contained in:
Eran Matityahu 2019-02-13 20:55:43 +02:00 committed by Kever Yang
parent ebe7071926
commit 8ea7412056
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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