From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 16 Aug 2018 08:24:57 +0000 (+0200)
Subject: 4.17-stable patches
X-Git-Tag: v3.18.119~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30d65b89a25f98e0fe88eacfa5f0306184015b94;p=thirdparty%2Fkernel%2Fstable-queue.git

4.17-stable patches

added patches:
	x86-i8259-add-missing-include-file.patch
---

diff --git a/queue-4.17/series b/queue-4.17/series
index 5dd1733cae7..00c90abe058 100644
--- a/queue-4.17/series
+++ b/queue-4.17/series
@@ -1 +1,2 @@
 x86-l1tf-fix-build-error-seen-if-config_kvm_intel-is-disabled.patch
+x86-i8259-add-missing-include-file.patch
diff --git a/queue-4.17/x86-i8259-add-missing-include-file.patch b/queue-4.17/x86-i8259-add-missing-include-file.patch
new file mode 100644
index 00000000000..e1f15fbd265
--- /dev/null
+++ b/queue-4.17/x86-i8259-add-missing-include-file.patch
@@ -0,0 +1,42 @@
+From 0a957467c5fd46142bc9c52758ffc552d4c5e2f7 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Wed, 15 Aug 2018 13:22:27 -0700
+Subject: x86: i8259: Add missing include file
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit 0a957467c5fd46142bc9c52758ffc552d4c5e2f7 upstream.
+
+i8259.h uses inb/outb and thus needs to include asm/io.h to avoid the
+following build error, as seen with x86_64:defconfig and CONFIG_SMP=n.
+
+  In file included from drivers/rtc/rtc-cmos.c:45:0:
+  arch/x86/include/asm/i8259.h: In function 'inb_pic':
+  arch/x86/include/asm/i8259.h:32:24: error:
+	implicit declaration of function 'inb'
+
+  arch/x86/include/asm/i8259.h: In function 'outb_pic':
+  arch/x86/include/asm/i8259.h:45:2: error:
+	implicit declaration of function 'outb'
+
+Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
+Suggested-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
+Fixes: 447ae3166702 ("x86: Don't include linux/irq.h from asm/hardirq.h")
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/include/asm/i8259.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/x86/include/asm/i8259.h
++++ b/arch/x86/include/asm/i8259.h
+@@ -3,6 +3,7 @@
+ #define _ASM_X86_I8259_H
+ 
+ #include <linux/delay.h>
++#include <asm/io.h>
+ 
+ extern unsigned int cached_irq_mask;
+