projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
virt
/
kvm
/
kvm_main.c
diff --git
a/virt/kvm/kvm_main.c
b/virt/kvm/kvm_main.c
index ec298b7ca556e5c3e66f85bb77b334cd86182d1f..482612b4e496f92527d5191a2a8adfa5962e4de8 100644
(file)
--- a/
virt/kvm/kvm_main.c
+++ b/
virt/kvm/kvm_main.c
@@
-53,7
+53,7
@@
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/ioctl.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include <asm/pgtable.h>
#include "coalesced_mmio.h"