From 66ffb275faa0656cfc7fd51292357989719b8d5a Mon Sep 17 00:00:00 2001
From: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Date: Tue, 17 Oct 2017 09:11:44 +0200
Subject: [PATCH 1/3] missing: fix bpf() define for Tilera

__NR_bpf syscall uses the default generic value for Tilera, e.g. 280.
---
 src/basic/missing_syscall.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index fd82c11e94..5138a74a06 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -334,6 +334,8 @@ static inline ssize_t copy_file_range(int fd_in, loff_t *off_in,
 #      define __NR_bpf 349
 #    elif defined __s390__
 #      define __NR_bpf 351
+#    elif defined __tilegx__
+#      define __NR_bpf 280
 #    else
 #      warning "__NR_bpf not defined for your architecture"
 #    endif

From d07ba5d79004c7046c38362a638f961ee16504ec Mon Sep 17 00:00:00 2001
From: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Date: Wed, 11 Oct 2017 10:48:39 +0200
Subject: [PATCH 2/3] missing: add bpf() define for ARM definition

---
 src/basic/missing_syscall.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index 5138a74a06..c938d0d976 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -330,6 +330,8 @@ static inline ssize_t copy_file_range(int fd_in, loff_t *off_in,
 #      define __NR_bpf 321
 #    elif defined __aarch64__
 #      define __NR_bpf 280
+#    elif defined __arm__
+#      define __NR_bpf 386
 #    elif defined __sparc__
 #      define __NR_bpf 349
 #    elif defined __s390__

From 8a2b193a55284ecb25e726d5563330787b49e89e Mon Sep 17 00:00:00 2001
From: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Date: Mon, 25 Sep 2017 16:39:32 +0200
Subject: [PATCH 3/3] sd-radv: avoid redefinition of struct in6_addr

Both netinet/icmp6.h and linux/in6.h will define struct in6_addr, and in
user space we want to use the netinet/icmp6.h variant.

Fixes build problem:
In file included from src/libsystemd-network/sd-radv.c:23:0:
/home/hegtvedt/work/os/product/sunrise/root/_build/v2/include/linux/in6.h:30:8:
error: redefinition of 'struct in6_addr'
---
 src/libsystemd-network/sd-radv.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c
index 46704acdef..f6c984f011 100644
--- a/src/libsystemd-network/sd-radv.c
+++ b/src/libsystemd-network/sd-radv.c
@@ -21,7 +21,6 @@
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <linux/in6.h>
 
 #include "sd-radv.h"