diff options
| author | Tom Rini | 2019-04-09 12:10:53 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-04-09 12:10:53 -0400 |
| commit | 4c24dab391003b99b1e0784fd41fe756cb07039e (patch) | |
| tree | cc37d1cfeba55313d211267867fafef8bf397366 | |
| parent | 5a451f11c800cde986386aa7cab464b40260ae3c (diff) | |
| parent | 734b080e78805edbb3430a52c8c5b1aeee02bd9f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
| -rw-r--r-- | drivers/mtd/ubi/debug.h | 10 | ||||
| -rw-r--r-- | fs/ubifs/debug.h | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 8ad0c62733f..2c2faaf1b4d 100644 --- a/drivers/mtd/ubi/debug.h +++ b/drivers/mtd/ubi/debug.h @@ -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) diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index bad0c67f5da..5f6e12702de 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -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) |