From a0ed3a4ad53cc9179d18b483d3317bbd48efa088 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 2 Jun 2010 17:06:03 +0800
Subject: [PATCH] --- yaml --- r: 202315 b: refs/heads/master c:
 7bee342a9e994cce7122cb187b4f3ded9d871165 h: refs/heads/master i:   202313:
 b80084bc3989d2f41d83de2b37b311c915cef236   202311:
 447ec33d0e852841a1531385af2f5d21e2e21ece v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c6879f5777c4..13ce4fab94ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bd89007ab4243b36bc30f5fc4aa8b4f75ff8fc2
+refs/heads/master: 7bee342a9e994cce7122cb187b4f3ded9d871165
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index e6e0d7781af7..b08c0052e332 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -42,13 +42,13 @@
 #include <linux/srcu.h>
 #include <linux/slab.h>
 #include <linux/perf_event.h>
+#include <linux/uaccess.h>
 #include <trace/events/kvm.h>
 
 #define CREATE_TRACE_POINTS
 #include "trace.h"
 
 #include <asm/debugreg.h>
-#include <asm/uaccess.h>
 #include <asm/msr.h>
 #include <asm/desc.h>
 #include <asm/mtrr.h>