include/linux: Add missing include / fix build failure
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 45 lines · Peter Hüwe
From: Peter Huewe <[email protected]>
This patch fixes a build failure[1-2] by adding the missing
asm/memory.hinclude needed forarch_is_coherent().Error message:
In file included frominclude/linux/list_bl.h:5,
frominclude/linux/rculist_bl.h:7,
frominclude/linux/dcache.h:7,
frominclude/linux/fs.h:381,
fromarch/arm/mm/mmap.c:4:include/linux/bit_spinlock.h: In function 'bit_spin_unlock':include/linux/bit_spinlock.h:61: error: implicit declaration of function 'arch_is_coherent'KernelVersion: linux-next-20101215
Used configs:hackkit_defconfig(arm),ep93xx_defconfig(arm)References:
[1]http://kisskb.ellerman.id.au/kisskb/buildresult/3651495/ [2]http://kisskb.ellerman.id.au/kisskb/buildresult/3651425/Signed-off-by Peter Huewe <[email protected]>---
v2:
moved additional information in the commit message.include/linux/bit_spinlock.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)include/linux/bit_spinlock.h +1
-1@@ -4,6 +4,7 @@ #include <linux/kernel.h> #include <linux/preempt.h> #include <asm/atomic.h> +#include <asm/memory.h> /** bit-based spin_lock() -- 1.7.2.2
Quoted 1 line
--
hi Peter,
After apply the patch,
I got below error message while
# make i386_defconfig;make
CHK include/linux/version.h
CHK include/generated/utsrelease.h
CALL scripts/checksyscalls.sh
CC init/main.o
In file included from include/linux/list_bl.h:5,
from include/linux/rculist_bl.h:7,
from include/linux/dcache.h:7,
from include/linux/fs.h:381,
from include/linux/proc_fs.h:5,
from init/main.c:14:include/linux/bit_spinlock.h:7:24: error: asm/memory.h: No such file or directory
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2
I personally fix it by below patch now, but I'm not so sure if this is a good way to fix it.
git diff arch/arm/include/asm/system.h
arch/arm/include/asm/ renamed from arch/arm/include/asm/system.h +0 -0
system.h
index ec4327a..3222ab8 100644
arch/arm/include/asm/system.h +1 -0
@@ -155,6 +155,7 @@ extern unsigned int user_debug;#define rmb () dmb()#define wmb () mb()#else +#include <asm/memory.h> #define mb () do { if (arch_is_coherent()) dmb(); else barrier(); }
while (0)
#define rmb() do { if (arch_is_coherent()) dmb(); else barrier(); }
while (0)
#define wmb() do { if (arch_is_coherent()) dmb(); else barrier(); }
while (0)
Quoted 63 lines · Axel
Quoted 45 lines · Peter Hüwe
From: Peter Huewe <[email protected]>
This patch fixes a build failure[1-2] by adding the missing
asm/memory.hinclude needed forarch_is_coherent().Error message:
In file included frominclude/linux/list_bl.h:5,
frominclude/linux/rculist_bl.h:7,
frominclude/linux/dcache.h:7,
frominclude/linux/fs.h:381,
fromarch/arm/mm/mmap.c:4:include/linux/bit_spinlock.h: In function 'bit_spin_unlock':include/linux/bit_spinlock.h:61: error: implicit declaration of function 'arch_is_coherent'KernelVersion: linux-next-20101215
Used configs:hackkit_defconfig(arm),ep93xx_defconfig(arm)References:
[1]http://kisskb.ellerman.id.au/kisskb/buildresult/3651495/ [2]http://kisskb.ellerman.id.au/kisskb/buildresult/3651425/Signed-off-by Peter Huewe <[email protected]>---
v2:
moved additional information in the commit message.include/linux/bit_spinlock.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)include/linux/bit_spinlock.h +1
-1@@ -4,6 +4,7 @@ #include <linux/kernel.h> #include <linux/preempt.h> #include <asm/atomic.h> +#include <asm/memory.h> /** bit-based spin_lock() -- 1.7.2.2
Quoted 1 line
--
hi Peter,
After apply the patch,
I got below error message while# make i386_defconfig;makeCHK include/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CC init/main.o In file included from include/linux/list_bl.h:5, from include/linux/rculist_bl.h:7, from include/linux/dcache.h:7, from include/linux/fs.h:381, from include/linux/proc_fs.h:5, from init/main.c:14:
Quoted 7 lines
include/linux/bit_spinlock.h:7:24: error:asm/memory.h: No such file or directory
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2I personally fix it by below patch now, but I'm not so sure if this is a good way to fix it.
Yes it should be fixed in arm code. If someone would send along a patch to the maintainer, that would be appreciated.
Thanks,
Nick
Quoted 18 lines
git diff
arch/arm/include/asm/system.harch/arm/include/asm/ renamed from arch/arm/include/asm/system.h +0
-0
system.h
index ec4327a..3222ab8 100644arch/arm/include/asm/system.h +1
-0@@ -155,6 +155,7 @@ extern unsigned int user_debug;#define rmb () dmb()#define wmb () mb()#else +#include <asm/memory.h> #define mb () do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)#define rmb () do { if (arch_is_coherent()) dmb(); else barrier(); }while (0)
#definewmb()do { if (arch_is_coherent())dmb(); elsebarrier(); }
while (0)
Quoted 3 lines
Quoted 3 lines
After apply the patch,
I got below error message while# make i386_defconfig;make
Sorry about that - thanks for testing!
Quoted 5 lines
Quoted 2 lines
I personally fix it by below patch now, but I'm not so sure if this is a good way to fix it.
Yes it should be fixed in arm code. If someone would send along a patch to the maintainer, that would be appreciated.
Axel seems to have done that already - unfortunately I haven't found the time yesterday. Thanks!
I'll review/test the patch tonight - meanwhile you'll get a
Thanks,
Peter