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/rose/af_rose.c | 7 ++++--- kernel/net/rose/rose_link.c | 1 - kernel/net/rose/rose_route.c | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'kernel/net/rose') diff --git a/kernel/net/rose/af_rose.c b/kernel/net/rose/af_rose.c index 8ae603069..129d357d2 100644 --- a/kernel/net/rose/af_rose.c +++ b/kernel/net/rose/af_rose.c @@ -192,7 +192,8 @@ static void rose_kill_by_device(struct net_device *dev) if (rose->device == dev) { rose_disconnect(s, ENETUNREACH, ROSE_OUT_OF_ORDER, 0); - rose->neighbour->use--; + if (rose->neighbour) + rose->neighbour->use--; rose->device = NULL; } } @@ -520,7 +521,7 @@ static int rose_create(struct net *net, struct socket *sock, int protocol, if (sock->type != SOCK_SEQPACKET || protocol != 0) return -ESOCKTNOSUPPORT; - sk = sk_alloc(net, PF_ROSE, GFP_ATOMIC, &rose_proto); + sk = sk_alloc(net, PF_ROSE, GFP_ATOMIC, &rose_proto, kern); if (sk == NULL) return -ENOMEM; @@ -559,7 +560,7 @@ static struct sock *rose_make_new(struct sock *osk) if (osk->sk_type != SOCK_SEQPACKET) return NULL; - sk = sk_alloc(sock_net(osk), PF_ROSE, GFP_ATOMIC, &rose_proto); + sk = sk_alloc(sock_net(osk), PF_ROSE, GFP_ATOMIC, &rose_proto, 0); if (sk == NULL) return NULL; diff --git a/kernel/net/rose/rose_link.c b/kernel/net/rose/rose_link.c index e873d7d9f..c76638cc2 100644 --- a/kernel/net/rose/rose_link.c +++ b/kernel/net/rose/rose_link.c @@ -25,7 +25,6 @@ #include #include #include -#include #include static void rose_ftimer_expiry(unsigned long); diff --git a/kernel/net/rose/rose_route.c b/kernel/net/rose/rose_route.c index 40148932c..0fc76d845 100644 --- a/kernel/net/rose/rose_route.c +++ b/kernel/net/rose/rose_route.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include -- cgit 1.2.3-korg