summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2019-03-07 10:39:36 -0800
committerLaura Abbott <labbott@redhat.com>2019-03-07 10:39:36 -0800
commit4f4c8c10379696c972a324ab99be39e427cdfcde (patch)
tree81a4fec5a086f0f3d6e3bef965b4305bcff5e64b
parent4997df9dcb663da11fbee9e64d8a742aa9eea1e6 (diff)
downloadkernel-4f4c8c10379696c972a324ab99be39e427cdfcde.tar.gz
kernel-4f4c8c10379696c972a324ab99be39e427cdfcde.tar.xz
kernel-4f4c8c10379696c972a324ab99be39e427cdfcde.zip
Fix for compilation error linked to rhbz 1686419
-rw-r--r--0001-Fix-from-Arnd-for-compilation-error.patch27
-rw-r--r--kernel.spec3
2 files changed, 30 insertions, 0 deletions
diff --git a/0001-Fix-from-Arnd-for-compilation-error.patch b/0001-Fix-from-Arnd-for-compilation-error.patch
new file mode 100644
index 000000000..6b9d7e2a0
--- /dev/null
+++ b/0001-Fix-from-Arnd-for-compilation-error.patch
@@ -0,0 +1,27 @@
+From 4bab8719d0712b13063cdd0c0a3d24984bcd8b1f Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Thu, 7 Mar 2019 10:37:06 -0800
+Subject: [PATCH] Fix from Arnd for compilation error
+
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+ include/uapi/asm-generic/socket.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h
+index c8b430cb6dc4..8c1391c89171 100644
+--- a/include/uapi/asm-generic/socket.h
++++ b/include/uapi/asm-generic/socket.h
+@@ -2,8 +2,8 @@
+ #ifndef __ASM_GENERIC_SOCKET_H
+ #define __ASM_GENERIC_SOCKET_H
+
++#include <linux/posix_types.h>
+ #include <asm/sockios.h>
+-#include <asm/bitsperlong.h>
+
+ /* For setsockopt(2) */
+ #define SOL_SOCKET 1
+--
+2.20.1
+
diff --git a/kernel.spec b/kernel.spec
index 964caa316..5b44b51be 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -612,6 +612,9 @@ Patch509: i915-enable-fastboot-on-skylake.patch
# fastboot by default on VLV/CHV (BYT/CHT), queued in -next for merging into 5.1
Patch510: i915-enable-fastboot-on-vlv-chv.patch
+# rhbz 1686419
+Patch511: 0001-Fix-from-Arnd-for-compilation-error.patch
+
# END OF PATCH DEFINITIONS
%endif