linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] ARM: OMAP2+: Fix omap2+ build error.
@ 2012-03-30  8:57 R Sricharan
  2012-04-03 18:00 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: R Sricharan @ 2012-03-30  8:57 UTC (permalink / raw)
  To: linux-arm-kernel

With CONFIG_OMAP4_ERRATA_I688 enabled, omap2+ build
was broken as below.

	arch/arm/kernel/io.c: In function '_memcpy_toio':
	arch/arm/kernel/io.c:29: error: implicit declaration of function 'outer_sync'
	make[1]: *** [arch/arm/kernel/io.o] Error 1

after the commit,

	commit 9f97da78bf018206fb623cd351d454af2f105fe0
	Author: David Howells <dhowells@redhat.com>
	Date:   Wed Mar 28 18:30:01 2012 +0100

	    Disintegrate asm/system.h for ARM
    
	    Disintegrate asm/system.h for ARM.

Fixing this here.

Signed-off-by: R Sricharan <r.sricharan@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 arch/arm/include/asm/barrier.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
index 44f4a09..0511238 100644
--- a/arch/arm/include/asm/barrier.h
+++ b/arch/arm/include/asm/barrier.h
@@ -2,6 +2,7 @@
 #define __ASM_BARRIER_H
 
 #ifndef __ASSEMBLY__
+#include <asm/outercache.h>
 
 #define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
 
@@ -39,7 +40,6 @@
 #ifdef CONFIG_ARCH_HAS_BARRIERS
 #include <mach/barriers.h>
 #elif defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)
-#include <asm/outercache.h>
 #define mb()		do { dsb(); outer_sync(); } while (0)
 #define rmb()		dsb()
 #define wmb()		mb()
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-03 18:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-30  8:57 [PATCH v2] ARM: OMAP2+: Fix omap2+ build error R Sricharan
2012-04-03 18:00 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).