diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /virt/kvm/kvm_main.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'virt/kvm/kvm_main.c')
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 548f9253c195..5a0cd194dce0 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/percpu.h> | 24 | #include <linux/percpu.h> |
| 25 | #include <linux/gfp.h> | ||
| 26 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 27 | #include <linux/miscdevice.h> | 26 | #include <linux/miscdevice.h> |
| 28 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| @@ -46,6 +45,7 @@ | |||
| 46 | #include <linux/compat.h> | 45 | #include <linux/compat.h> |
| 47 | #include <linux/srcu.h> | 46 | #include <linux/srcu.h> |
| 48 | #include <linux/hugetlb.h> | 47 | #include <linux/hugetlb.h> |
| 48 | #include <linux/slab.h> | ||
| 49 | 49 | ||
| 50 | #include <asm/processor.h> | 50 | #include <asm/processor.h> |
| 51 | #include <asm/io.h> | 51 | #include <asm/io.h> |