Patchwork [U-Boot] common.h: Remove include compiler.h

login
register
mail settings
Submitter Marek Vasut
Date July 20, 2012, 8:12 p.m.
Message ID <1342815178-32546-1-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/172340/
State Accepted
Commit 546910f85f98a6868db14e7f25770e8996d6e777
Headers show

Comments

Marek Vasut - July 20, 2012, 8:12 p.m.
Remove this as including it on global scale breaks a lot of things.
This was reported by:
Matthew McClintock <B29882@freescale.com>

Fix found by:
Tom Rini <trini@ti.com>

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Tom Rini <trini@ti.com>
---
 include/common.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Wolfgang Denk - July 20, 2012, 8:30 p.m.
Dear Marek Vasut,

In message <1342815178-32546-1-git-send-email-marex@denx.de> you wrote:
> Remove this as including it on global scale breaks a lot of things.
> This was reported by:
> Matthew McClintock <B29882@freescale.com>
> 
> Fix found by:
> Tom Rini <trini@ti.com>
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Tom Rini <trini@ti.com>
> ---
>  include/common.h |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/include/common.h b/include/common.h
index be9c278..39859d3 100644
--- a/include/common.h
+++ b/include/common.h
@@ -39,7 +39,6 @@  typedef volatile unsigned char	vu_char;
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/string.h>
-#include <linux/compiler.h>
 #include <asm/ptrace.h>
 #include <stdarg.h>
 #if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000))
@@ -959,7 +958,7 @@  int cpu_release(int nr, int argc, char * const argv[]);
  */
 #define DEFINE_ALIGN_BUFFER(type, name, size, align)			\
 	static char __##name[roundup(size * sizeof(type), align)]	\
-			__aligned(align);				\
+			__attribute__((aligned(align)));				\
 									\
 	static type *name = (type *)__##name
 #define DEFINE_CACHE_ALIGN_BUFFER(type, name, size)			\