summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2018-08-15 13:22:27 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-17 21:03:47 +0200
commitfcaef4e27f16b92d4d97ac56fd0f9875438b7678 (patch)
tree791982ff90e2143e68ced93d6be64d7d8c256d52
parenta8ac113d444a49a5b8aba80922b3864b699b0b26 (diff)
downloadlinux-stable-fcaef4e27f16b92d4d97ac56fd0f9875438b7678.tar.gz
linux-stable-fcaef4e27f16b92d4d97ac56fd0f9875438b7678.tar.bz2
linux-stable-fcaef4e27f16b92d4d97ac56fd0f9875438b7678.zip
x86: i8259: Add missing include file
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>
-rw-r--r--arch/x86/include/asm/i8259.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
index 5cdcdbd4d892..89789e8c80f6 100644
--- 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;