Patchwork [U-Boot,v3,1/2] common: move BUILD_BUG_ON define to common.h

login
register
mail settings
Submitter Heiko Schocher
Date June 9, 2011, 9:07 a.m.
Message ID <1307610425-10481-1-git-send-email-hs@denx.de>
Download mbox | patch
Permalink /patch/99702/
State Accepted
Commit c00e17c7fe184c966e34ad48bf753c930ebac1df
Headers show

Comments

Heiko Schocher - June 9, 2011, 9:07 a.m.
see discussion also here:
http://patchwork.ozlabs.org/patch/75309/

Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Holger Brunck <holger.brunck@keymile.com>

---
- changes for v3
  moved this define only to common.h

  If we find a good name for a headerfile which is
  suggested in thread:
  http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/78692

  that would be a better place for it. Maybe:
  include/gp_helpers.h (general purpose helpers ...)?


 include/common.h    |    3 +++
 include/ubi_uboot.h |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
Wolfgang Denk - July 27, 2011, 9:46 p.m.
Dear Heiko Schocher,

In message <1307610425-10481-1-git-send-email-hs@denx.de> you wrote:
> see discussion also here:
> http://patchwork.ozlabs.org/patch/75309/
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>
> cc: Wolfgang Denk <wd@denx.de>
> cc: Holger Brunck <holger.brunck@keymile.com>
> 
> ---
> - changes for v3
>   moved this define only to common.h
> 
>   If we find a good name for a headerfile which is
>   suggested in thread:
>   http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/78692
> 
>   that would be a better place for it. Maybe:
>   include/gp_helpers.h (general purpose helpers ...)?
> 
> 
>  include/common.h    |    3 +++
>  include/ubi_uboot.h |    3 ---
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/include/common.h b/include/common.h
index 1e4a6a5..5937bf0 100644
--- a/include/common.h
+++ b/include/common.h
@@ -137,6 +137,9 @@  typedef volatile unsigned char	vu_char;
 #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
 #endif /* BUG */
 
+/* Force a compilation error if condition is true */
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+
 typedef void (interrupt_handler_t)(void *);
 
 #include <asm/u-boot.h> /* boot information for Linux kernel */
diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index d2c90a6..69006e2 100644
--- a/include/ubi_uboot.h
+++ b/include/ubi_uboot.h
@@ -191,9 +191,6 @@  static inline long IS_ERR(const void *ptr)
 	return IS_ERR_VALUE((unsigned long)ptr);
 }
 
-/* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-
 /* module */
 #define THIS_MODULE		0
 #define try_module_get(...)	1