X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fasm-generic%2Fbug.h;h=630dd23722381851ae9f8ba3a838283f3a8aa8e2;hb=256cf4c438e60116785a83b060614c63c7477e84;hp=2d54d8df7bd1896eef1b5d30f20beff323884cf3;hpb=a3f7607d09e28520ad6d86ea423051605f7d4c6f;p=firefly-linux-kernel-4.4.55.git

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 2d54d8df7bd1..630dd2372238 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -138,7 +138,7 @@ extern void warn_slowpath_null(const char *file, const int line);
 
 #else /* !CONFIG_BUG */
 #ifndef HAVE_ARCH_BUG
-#define BUG() do {} while (0)
+#define BUG() do {} while (1)
 #endif
 
 #ifndef HAVE_ARCH_BUG_ON
@@ -155,6 +155,7 @@ extern void warn_slowpath_null(const char *file, const int line);
 #ifndef WARN
 #define WARN(condition, format...) ({					\
 	int __ret_warn_on = !!(condition);				\
+	no_printk(format);						\
 	unlikely(__ret_warn_on);					\
 })
 #endif