Re: net-next Compile error

2017-10-28 Thread David Miller
From: Egil Hjelmeland 
Date: Fri, 27 Oct 2017 15:50:25 +0200

> Starting with net-next commit 60e2a7780793bae0debc275a9ccd57f7da0cf195
> "tcp: TCP experimental option for SMC", I can not cross compile the
> kernel.

Thanks for the report, I've committed the following fix for this:


[PATCH] tcp: Remove "linux/unaligned/access_ok.h" include.

This causes build failures:

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:7:28: error: redefinition of
'get_unaligned_le16'
In file included from ./include/asm-generic/unaligned.h:17:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:6:19: note: previous definition
of 'get_unaligned_le16' was here
In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:12:28: error: redefinition of
'get_unaligned_le32'

Plain "asm/access_ok.h", which is already included, is
sufficient.

Fixes: 60e2a7780793 ("tcp: TCP experimental option for SMC")
Reported-by: Egil Hjelmeland 
Signed-off-by: David S. Miller 
---
 net/ipv4/tcp_input.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 21c358c0cf2e..b62a7d1707ae 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -76,7 +76,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
-- 
2.13.6



Re: net-next Compile error

2017-10-27 Thread Egil Hjelmeland



Den 27. okt. 2017 15:50, skrev Egil Hjelmeland:
Starting with net-next commit 60e2a7780793bae0debc275a9ccd57f7da0cf195 
"tcp: TCP experimental option for SMC", I can not cross compile the kernel.


In file included from ./include/asm-generic/unaligned.h:17:0,
  from ./arch/arm/include/generated/asm/unaligned.h:1,
  from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:6:19: note: previous definition of 
'get_unaligned_le16' was here

Hi Egil
Long since you did "make distclean"?

BR
Egil



net-next Compile error

2017-10-27 Thread Egil Hjelmeland
Starting with net-next commit 60e2a7780793bae0debc275a9ccd57f7da0cf195 
"tcp: TCP experimental option for SMC", I can not cross compile the kernel.


ARCH=arm

arm-v5te-linux-gnueabi-gcc --version
arm-v5te-linux-gnueabi-gcc (OSELAS.Toolchain-2012.12.1) 4.7.2

make zImage


  CC  net/ipv4/netfilter/ipt_MASQUERADE.o
In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:7:28: error: redefinition of 
'get_unaligned_le16'

In file included from ./include/asm-generic/unaligned.h:17:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:6:19: note: previous definition of 
'get_unaligned_le16' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:12:28: error: redefinition of 
'get_unaligned_le32'

In file included from ./include/asm-generic/unaligned.h:17:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:11:19: note: previous definition 
of 'get_unaligned_le32' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:17:28: error: redefinition of 
'get_unaligned_le64'

In file included from ./include/asm-generic/unaligned.h:17:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:16:19: note: previous definition 
of 'get_unaligned_le64' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:22:28: error: redefinition of 
'get_unaligned_be16'

In file included from ./include/asm-generic/unaligned.h:18:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/be_byteshift.h:40:19: note: previous 
definition of 'get_unaligned_be16' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:27:28: error: redefinition of 
'get_unaligned_be32'

In file included from ./include/asm-generic/unaligned.h:18:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/be_byteshift.h:45:19: note: previous 
definition of 'get_unaligned_be32' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:32:28: error: redefinition of 
'get_unaligned_be64'

In file included from ./include/asm-generic/unaligned.h:18:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/be_byteshift.h:50:19: note: previous 
definition of 'get_unaligned_be64' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:37:29: error: redefinition of 
'put_unaligned_le16'

In file included from ./include/asm-generic/unaligned.h:17:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:21:20: note: previous definition 
of 'put_unaligned_le16' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:42:29: error: redefinition of 
'put_unaligned_le32'

In file included from ./include/asm-generic/unaligned.h:17:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:26:20: note: previous definition 
of 'put_unaligned_le32' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:47:29: error: redefinition of 
'put_unaligned_le64'

In file included from ./include/asm-generic/unaligned.h:17:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:31:20: note: previous definition 
of 'put_unaligned_le64' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:52:29: error: redefinition of 
'put_unaligned_be16'

In file included from ./include/asm-generic/unaligned.h:18:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/be_byteshift.h:55:20: note: previous 
definition of 'put_unaligned_be16' was here

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:57:29: error: redefinition of 
'put_unaligned_be32'

In file included from ./include/asm-generic/unaligned.h:18:0,
 from ./arch/arm/include/generated/asm/unaligned.h:1,
 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/be_byteshift.h:60:20: note: previous 
definition of 'put_unaligned_be32'