diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-27 15:08:42 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 11:33:15 +0300 |
| commit | 9de94dbb90293fb1abfb4555685be3b080fe47b5 (patch) | |
| tree | 6c48f205e323543dd28327650413d36a194e8f24 | |
| parent | 8ec67d97bff592cc5b5325d1ee3646ebd7d635fc (diff) | |
| download | linux-9de94dbb90293fb1abfb4555685be3b080fe47b5.tar.xz | |
x86/boot/e820: Remove unnecessary #include <linux/ioport.h> from asm/e820/api.h
There's a completely unnecessary inclusion of linux/ioport.h near
the end of the asm/e820/api.h file.
Remove it and fix up unrelated code that learned to rely on this
spurious inclusion of a generic header.
No change in functionality.
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/include/asm/e820/api.h | 2 | ||||
| -rw-r--r-- | arch/x86/mm/ioremap.c | 1 | ||||
| -rw-r--r-- | arch/x86/mm/pat.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index 848b9f61808c..e8ad6d9c9974 100644 --- a/arch/x86/include/asm/e820/api.h +++ b/arch/x86/include/asm/e820/api.h @@ -46,6 +46,4 @@ static inline bool is_ISA_range(u64 start, u64 end) return start >= ISA_START_ADDRESS && end <= ISA_END_ADDRESS; } -#include <linux/ioport.h> - #endif /* _ASM_E820_API_H */ diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index d4f2b40a9641..c43b6b33463a 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -9,6 +9,7 @@ #include <linux/bootmem.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/ioport.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/mmiotrace.h> diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 41b0f2f3d90b..9b78685b66e6 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -10,6 +10,7 @@ #include <linux/seq_file.h> #include <linux/bootmem.h> #include <linux/debugfs.h> +#include <linux/ioport.h> #include <linux/kernel.h> #include <linux/pfn_t.h> #include <linux/slab.h> |