From c8058b88379ef2e72f184ee2be186d99a12beabd Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
Date: Mon, 15 Jun 2015 12:49:42 +0100
Subject: [PATCH] kvmtool: Fix compile error on MIPS

When including asm-generic/types.h instead of asm/types.h it results
in conflicting types for __s64 et al (at least with my
toolchain). Other header files are including asm/types.h
(e.g. include/kvm/ioport.h) and types defined there don't necessarily
match the types defined in asm-generic/types.h.

Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 include/linux/types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/types.h b/include/linux/types.h
index 17807b8..5e20f10 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -3,7 +3,7 @@
 
 #include <kvm/compiler.h>
 #define __SANE_USERSPACE_TYPES__	/* For PPC64, to get LL64 types */
-#include <asm-generic/types.h>
+#include <asm/types.h>
 
 typedef __u64 u64;
 typedef __s64 s64;