]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-4.14/net-split-out-functions-related-to-registering-inflight-socket...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Jul 2021 12:01:26 +0000 (14:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Jul 2021 12:01:26 +0000 (14:01 +0200)
queue-4.14/net-split-out-functions-related-to-registering-inflight-socket-files.patch

index 0550370de782cb00a63b15e02b0c8437221ead2b..79ff2043388c3af891b1b5adf90d9fa5eb6b0a09 100644 (file)
@@ -26,9 +26,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  net/unix/Makefile     |    2 
  net/unix/af_unix.c    |   63 ---------------------
  net/unix/garbage.c    |   68 ----------------------
- net/unix/scm.c        |  148 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ net/unix/scm.c        |  149 ++++++++++++++++++++++++++++++++++++++++++++++++++
  net/unix/scm.h        |   10 +++
- 8 files changed, 171 insertions(+), 128 deletions(-)
+ 8 files changed, 172 insertions(+), 128 deletions(-)
  create mode 100644 net/unix/scm.c
  create mode 100644 net/unix/scm.h
 
@@ -238,7 +238,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  {
 --- /dev/null
 +++ b/net/unix/scm.c
-@@ -0,0 +1,148 @@
+@@ -0,0 +1,149 @@
 +// SPDX-License-Identifier: GPL-2.0
 +#include <linux/module.h>
 +#include <linux/kernel.h>
@@ -249,6 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +#include <net/af_unix.h>
 +#include <net/scm.h>
 +#include <linux/init.h>
++#include <linux/sched/signal.h>
 +
 +#include "scm.h"
 +