diff mbox

[RFC] x86: remove vmalloc.h from asm/io.h

Message ID 20150529224006.23096056@canb.auug.org.au (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Stephen Rothwell May 29, 2015, 12:40 p.m. UTC 
Hi Ingo,

On Fri, 29 May 2015 11:21:05 +0200 Ingo Molnar <mingo@kernel.org> wrote:
>
> Good idea.
> 
> Acked-by: Ingo Molnar <mingo@kernel.org>

Thanks.

> Please also test x86 allnoconfig and defconfig 32/64, that tends to unearth the 
> remaining places. People doing randconfig testing will find the rest.

Good idea.  the allnoconfigs produced this further patch.  I will
squash it into the original.  The defconfigs built ok.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 May 2015 22:01:41 +1000
Subject: [PATCH] x86: more fixes for removing vmalloc.h fron asm/io.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/include/asm/io.h | 1 +
 include/linux/io.h        | 1 +
 2 files changed, 2 insertions(+)
diff mbox

Patch

diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 5791e7ace9db..2a3543a4db1d 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -40,6 +40,7 @@ 
 #include <linux/compiler.h>
 #include <asm/page.h>
 #include <asm/early_ioremap.h>
+#include <asm/pgtable_types.h>
 
 #define build_mmio_read(name, size, type, reg, barrier) \
 static inline type name(const volatile void __iomem *addr) \
diff --git a/include/linux/io.h b/include/linux/io.h
index 986f2bffea1e..cb753a2450b8 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -19,6 +19,7 @@ 
 #define _LINUX_IO_H
 
 #include <linux/types.h>
+#include <linux/init.h>
 #include <asm/io.h>
 #include <asm/page.h>