From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/net/netrom/af_netrom.c | 4 ++-- kernel/net/netrom/nr_route.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'kernel/net/netrom') diff --git a/kernel/net/netrom/af_netrom.c b/kernel/net/netrom/af_netrom.c index b987fd56c..ed212ffc1 100644 --- a/kernel/net/netrom/af_netrom.c +++ b/kernel/net/netrom/af_netrom.c @@ -433,7 +433,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, if (sock->type != SOCK_SEQPACKET || protocol != 0) return -ESOCKTNOSUPPORT; - sk = sk_alloc(net, PF_NETROM, GFP_ATOMIC, &nr_proto); + sk = sk_alloc(net, PF_NETROM, GFP_ATOMIC, &nr_proto, kern); if (sk == NULL) return -ENOMEM; @@ -476,7 +476,7 @@ static struct sock *nr_make_new(struct sock *osk) if (osk->sk_type != SOCK_SEQPACKET) return NULL; - sk = sk_alloc(sock_net(osk), PF_NETROM, GFP_ATOMIC, osk->sk_prot); + sk = sk_alloc(sock_net(osk), PF_NETROM, GFP_ATOMIC, osk->sk_prot, 0); if (sk == NULL) return NULL; diff --git a/kernel/net/netrom/nr_route.c b/kernel/net/netrom/nr_route.c index 96b64d2f6..d72a4f155 100644 --- a/kernel/net/netrom/nr_route.c +++ b/kernel/net/netrom/nr_route.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include -- cgit 1.2.3-korg