VM_BUG() complements VM_BUG_ON() just like with WARN() and WARN_ON(). This lets us format custom strings to output when a VM_BUG() is hit. Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx> --- include/linux/mmdebug.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index 8b3f5a0..42f41e3 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -12,7 +12,14 @@ char *format_page(struct page *page, char *buf, char *end); #ifdef CONFIG_DEBUG_VM char *format_vma(const struct vm_area_struct *vma, char *buf, char *end); char *format_mm(const struct mm_struct *mm, char *buf, char *end); -#define VM_BUG_ON(cond) BUG_ON(cond) +#define VM_BUG(cond, fmt...) \ + do { \ + if (unlikely(cond)) { \ + pr_emerg(fmt); \ + BUG(); \ + } \ + } while (0) +#define VM_BUG_ON(cond) VM_BUG(cond, "%s\n", __stringify(cond)) #define VM_BUG_ON_PAGE(cond, page) \ do { \ if (unlikely(cond)) { \ @@ -46,6 +53,7 @@ static char *format_mm(const struct mm_struct *mm, char *buf, char *end) { return buf; } +#define VM_BUG(cond, fmt...) BUILD_BUG_ON_INVALID(cond) #define VM_BUG_ON(cond) BUILD_BUG_ON_INVALID(cond) #define VM_BUG_ON_PAGE(cond, page) VM_BUG_ON(cond) #define VM_BUG_ON_VMA(cond, vma) VM_BUG_ON(cond) -- 1.7.10.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>