Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54d6d537 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradead.org/ubi-2.6 

* branch 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: not build debug messages with CONFIG_UBIFS_FS_DEBUG disabled

* branch 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: do not link debug messages when debugging is disabled
parents 4fc1d39e 016f1c54 9efabc84

drivers/mtd/ubi/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi) 


#define ubi_dbg_msg(fmt, ...) do {                                           \

	if (0)                                                               \

		pr_debug(fmt "\n", ##__VA_ARGS__);                           \

		printk(KERN_DEBUG fmt "\n", ##__VA_ARGS__);                  \

} while (0)



#define dbg_msg(fmt, ...)  ubi_dbg_msg(fmt, ##__VA_ARGS__)

fs/ubifs/debug.h

+3 −3
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ void dbg_debugfs_exit_fs(struct ubifs_info *c); 


#define ubifs_dbg_msg(fmt, ...) do {                        \

	if (0)                                              \

		pr_debug(fmt "\n", ##__VA_ARGS__); \

		printk(KERN_DEBUG fmt "\n", ##__VA_ARGS__); \

} while (0)



#define dbg_dump_stack()