git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
kvm_host.h
diff --git
a/arch/powerpc/include/asm/kvm_host.h
b/arch/powerpc/include/asm/kvm_host.h
index
fddc3ed
..
c9c930e
100644
(file)
--- a/
arch/powerpc/include/asm/kvm_host.h
+++ b/
arch/powerpc/include/asm/kvm_host.h
@@
-34,7
+34,8
@@
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
/* We don't currently support large pages. */
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
/* We don't currently support large pages. */
-#define KVM_PAGES_PER_HPAGE (1UL << 31)
+#define KVM_NR_PAGE_SIZES 1
+#define KVM_PAGES_PER_HPAGE(x) (1UL<<31)
struct kvm;
struct kvm_run;
struct kvm;
struct kvm_run;
@@
-153,7
+154,6
@@
struct kvm_vcpu_arch {
u32 pid;
u32 swap_pid;
u32 pid;
u32 swap_pid;
- u32 pvr;
u32 ccr0;
u32 ccr1;
u32 dbcr0;
u32 ccr0;
u32 ccr1;
u32 dbcr0;