Skip to contentSkip to conversation

ARM: OMAP2+: Fix omap2+ build error.

PATCH New R Sricharan 2 participants 2 messages Mar 30, 2012 – Apr 3, 2012 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: OMAP2+: Fix omap2+ build error.

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 <[email protected]>
Date: Wed Mar 28 18:30:01 2012 +0100

Disintegrate asm/system.h for ARM

Disintegrate asm/system.h for ARM.

Fixing this here.

---
 arch/arm/include/asm/barrier.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/include/asm/barrier.h +1 -1
index 44f4a09..0511238 100644
@@ -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()
Signature · 1 line
1.7.1
#1 lore raw

PATCH v2 1/1 ARM: OMAP2+: Fix omap2+ build error.

Quoted 2 lines · R Sricharan

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

Thanks applying into fixes.

Tony