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 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
kvm_book3s_asm.h
diff --git
a/arch/powerpc/include/asm/kvm_book3s_asm.h
b/arch/powerpc/include/asm/kvm_book3s_asm.h
index
ef7b368
..
1f2f5b6
100644
(file)
--- a/
arch/powerpc/include/asm/kvm_book3s_asm.h
+++ b/
arch/powerpc/include/asm/kvm_book3s_asm.h
@@
-75,6
+75,8
@@
struct kvmppc_host_state {
ulong scratch0;
ulong scratch1;
u8 in_guest;
+ u8 restore_hid5;
+ u8 napping;
#ifdef CONFIG_KVM_BOOK3S_64_HV
struct kvm_vcpu *kvm_vcpu;