mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
To: barebox@lists.infradead.org
Subject: [PATCH 2/3] asm-generic/bug.h: move BUG(), BUG_ON(), WARN(), WARN_ON() macros
Date: Thu, 29 Jan 2015 11:14:06 +0900	[thread overview]
Message-ID: <1422497647-28863-3-git-send-email-yamada.m@jp.panasonic.com> (raw)
In-Reply-To: <1422497647-28863-1-git-send-email-yamada.m@jp.panasonic.com>

In Linux, these macros are defined in include/asm-generic/bug.h.
To tidy up common.h, move BUG(), BUG_ON(), WARN(), WARN_ON() there.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

 include/asm-generic/bug.h | 37 +++++++++++++++++++++++++++++++++++++
 include/common.h          | 32 --------------------------------
 include/linux/bug.h       |  2 ++
 3 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 include/asm-generic/bug.h

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
new file mode 100644
index 0000000..8583d24
--- /dev/null
+++ b/include/asm-generic/bug.h
@@ -0,0 +1,37 @@
+#ifndef _ASM_GENERIC_BUG_H
+#define _ASM_GENERIC_BUG_H
+
+#include <linux/compiler.h>
+
+#define BUG() do { \
+	printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
+	panic("BUG!"); \
+} while (0)
+#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
+
+
+#define __WARN() do { 								\
+	printf("WARNING: at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__);	\
+} while (0)
+
+#ifndef WARN_ON
+#define WARN_ON(condition) ({						\
+	int __ret_warn_on = !!(condition);				\
+	if (unlikely(__ret_warn_on))					\
+		__WARN();						\
+	unlikely(__ret_warn_on);					\
+})
+#endif
+
+#ifndef WARN
+#define WARN(condition, format...) ({					\
+	int __ret_warn_on = !!(condition);				\
+	if (unlikely(__ret_warn_on)) {					\
+		__WARN();						\
+		puts("WARNING: ");					\
+		printf(format);						\
+	}								\
+	unlikely(__ret_warn_on);					\
+})
+#endif
+#endif
diff --git a/include/common.h b/include/common.h
index c30f6bd..289f7c9 100644
--- a/include/common.h
+++ b/include/common.h
@@ -50,38 +50,6 @@
 #error "None of __LITTLE_ENDIAN and __BIG_ENDIAN are defined"
 #endif
 
-#define BUG() do { \
-	printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
-	panic("BUG!"); \
-} while (0)
-#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
-
-
-#define __WARN() do { 								\
-	printf("WARNING: at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__);	\
-} while (0)
-
-#ifndef WARN_ON
-#define WARN_ON(condition) ({						\
-	int __ret_warn_on = !!(condition);				\
-	if (unlikely(__ret_warn_on))					\
-		__WARN();						\
-	unlikely(__ret_warn_on);					\
-})
-#endif
-
-#ifndef WARN
-#define WARN(condition, format...) ({					\
-	int __ret_warn_on = !!(condition);				\
-	if (unlikely(__ret_warn_on)) {					\
-		__WARN();						\
-		puts("WARNING: ");					\
-		printf(format);						\
-	}								\
-	unlikely(__ret_warn_on);					\
-})
-#endif
-
 #include <asm/barebox.h> /* boot information for Linux kernel */
 
 /*
diff --git a/include/linux/bug.h b/include/linux/bug.h
index 3449837..7295618 100644
--- a/include/linux/bug.h
+++ b/include/linux/bug.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_BUG_H
 #define _LINUX_BUG_H
 
+#include <asm-generic/bug.h>
+
 #ifdef __CHECKER__
 #define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0)
 #define BUILD_BUG_ON_ZERO(e) (0)
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2015-01-29  2:14 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-29  2:14 [PATCH 0/3] Slim down include/common.h more Masahiro Yamada
2015-01-29  2:14 ` [PATCH 1/3] linux/bug.h: move BUILD_BUG_ON*() macros Masahiro Yamada
2015-01-29  2:14 ` Masahiro Yamada [this message]
2015-01-29  2:14 ` [PATCH 3/3] linux/kernel.h: move some macros and prototypes Masahiro Yamada
2015-01-29  3:54 ` [PATCH 0/3] Slim down include/common.h more Masahiro Yamada
2015-01-29  8:04   ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422497647-28863-3-git-send-email-yamada.m@jp.panasonic.com \
    --to=yamada.m@jp.panasonic.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox