aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/hyperv
diff options
context:
space:
mode:
authorStephen Rothwell <[email protected]>2015-06-02 19:01:38 +1000
committerIngo Molnar <[email protected]>2015-06-03 12:02:00 +0200
commitd6472302f242559d45dcf4ebace62508dc4d8aeb (patch)
treeac090889ee3e05f35303f7a92804020240f90cd3 /drivers/net/hyperv
parent1e6277de3a23373b89e0affc3d179f2173b857a4 (diff)
x86/mm: Decouple <linux/vmalloc.h> from <asm/io.h>
Nothing in <asm/io.h> uses anything from <linux/vmalloc.h>, so remove it from there and fix up the resulting build problems triggered on x86 {64|32}-bit {def|allmod|allno}configs. The breakages were triggering in places where x86 builds relied on vmalloc() facilities but did not include <linux/vmalloc.h> explicitly and relied on the implicit inclusion via <asm/io.h>. Also add: - <linux/init.h> to <linux/io.h> - <asm/pgtable_types> to <asm/io.h> ... which were two other implicit header file dependencies. Suggested-by: David Miller <[email protected]> Signed-off-by: Stephen Rothwell <[email protected]> [ Tidied up the changelog. ] Acked-by: David Miller <[email protected]> Acked-by: Takashi Iwai <[email protected]> Acked-by: Viresh Kumar <[email protected]> Acked-by: Vinod Koul <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Anton Vorontsov <[email protected]> Cc: Boris Ostrovsky <[email protected]> Cc: Colin Cross <[email protected]> Cc: David Vrabel <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Haiyang Zhang <[email protected]> Cc: James E.J. Bottomley <[email protected]> Cc: Jaroslav Kysela <[email protected]> Cc: K. Y. Srinivasan <[email protected]> Cc: Kees Cook <[email protected]> Cc: Konrad Rzeszutek Wilk <[email protected]> Cc: Kristen Carlson Accardi <[email protected]> Cc: Len Brown <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Suma Ramars <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Tony Luck <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/net/hyperv')
-rw-r--r--drivers/net/hyperv/netvsc.c1
-rw-r--r--drivers/net/hyperv/rndis_filter.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index ea091bc5ff09..1e09243d5449 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -28,6 +28,7 @@
#include <linux/slab.h>
#include <linux/netdevice.h>
#include <linux/if_ether.h>
+#include <linux/vmalloc.h>
#include <asm/sync_bitops.h>
#include "hyperv_net.h"
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 9118cea91882..35a482d526d9 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -27,6 +27,7 @@
#include <linux/netdevice.h>
#include <linux/if_vlan.h>
#include <linux/nls.h>
+#include <linux/vmalloc.h>
#include "hyperv_net.h"