diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
commit | b79b3e05b1229d5b2fc2af71dc29701642577eba (patch) | |
tree | bcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /arch/powerpc/kvm/trace.h | |
parent | b8e513a2ecafb5bb068c00be98d584871afcd4c3 (diff) | |
parent | c5ad48f3117c4aae379b536f3270fc1efae945c0 (diff) |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/powerpc/kvm/trace.h')
-rw-r--r-- | arch/powerpc/kvm/trace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h index 3aca1b042b8..b135d3d397d 100644 --- a/arch/powerpc/kvm/trace.h +++ b/arch/powerpc/kvm/trace.h @@ -103,7 +103,7 @@ TRACE_EVENT(kvm_gtlb_write, * 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), @@ -252,7 +252,7 @@ TRACE_EVENT(kvm_book3s_mmu_flush, ), 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; |