1b0838822e8fa96f22a1dc46a2b6dc720ae468bc
[glsdk/meta-ti-glsdk.git] / recipes-bsp / linux / linux-omap / linus / 0047-ARM-6605-1-Add-missing-include-asm-memory.h.patch
1 From ff3df95843c9713d7b7247c461b955b1f794db76 Mon Sep 17 00:00:00 2001
2 From: Axel Lin <axel.lin@gmail.com>
3 Date: Mon, 3 Jan 2011 02:26:53 +0100
4 Subject: [PATCH 47/65] ARM: 6605/1: Add missing include "asm/memory.h"
6 This patch fixes below build error by adding the missing asm/memory.h,
7 which is needed for arch_is_coherent().
9 $ make pxa3xx_defconfig; make
10 CC init/do_mounts_rd.o
11 In file included from include/linux/list_bl.h:5,
12 from include/linux/rculist_bl.h:7,
13 from include/linux/dcache.h:7,
14 from include/linux/fs.h:381,
15 from init/do_mounts_rd.c:3:
16 include/linux/bit_spinlock.h: In function 'bit_spin_unlock':
17 include/linux/bit_spinlock.h:61: error: implicit declaration of function 'arch_is_coherent'
18 make[1]: *** [init/do_mounts_rd.o] Error 1
19 make: *** [init] Error 2
21 Signed-off-by: Axel Lin <axel.lin@gmail.com>
22 Acked-by: Peter Huewe <peterhuewe@gmx.de>
23 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
24 ---
25 arch/arm/include/asm/system.h | 1 +
26 1 files changed, 1 insertions(+), 0 deletions(-)
28 diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
29 index 1120f18..8002594 100644
30 --- a/arch/arm/include/asm/system.h
31 +++ b/arch/arm/include/asm/system.h
32 @@ -150,6 +150,7 @@ extern unsigned int user_debug;
33 #define rmb() dmb()
34 #define wmb() mb()
35 #else
36 +#include <asm/memory.h>
37 #define mb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
38 #define rmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
39 #define wmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
40 --
41 1.6.6.1