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 'for-upstream' of git://openrisc.net/jonas/linux
[pandora-kernel.git]
/
arch
/
powerpc
/
kvm
/
trace.h
diff --git
a/arch/powerpc/kvm/trace.h
b/arch/powerpc/kvm/trace.h
index
3aca1b0
..
b135d3d
100644
(file)
--- a/
arch/powerpc/kvm/trace.h
+++ b/
arch/powerpc/kvm/trace.h
@@
-103,7
+103,7
@@
TRACE_EVENT(kvm_gtlb_write,
* Book3S trace points *
*************************************************************************/
* Book3S trace points *
*************************************************************************/
-#ifdef CONFIG_
PPC_BOOK3S
+#ifdef CONFIG_
KVM_BOOK3S_PR
TRACE_EVENT(kvm_book3s_exit,
TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu),
TRACE_EVENT(kvm_book3s_exit,
TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu),
@@
-252,7
+252,7
@@
TRACE_EVENT(kvm_book3s_mmu_flush,
),
TP_fast_assign(
),
TP_fast_assign(
- __entry->count =
vcpu->arch.
hpte_cache_count;
+ __entry->count =
to_book3s(vcpu)->
hpte_cache_count;
__entry->p1 = p1;
__entry->p2 = p2;
__entry->type = type;
__entry->p1 = p1;
__entry->p2 = p2;
__entry->type = type;