← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to arch/powerpc/include/asm/kvm_book3s_64.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/include/asm/kvm_book3s_64.h
20
20
#ifndef __ASM_KVM_BOOK3S_64_H__
21
21
#define __ASM_KVM_BOOK3S_64_H__
22
22
 
23
 
#ifdef CONFIG_KVM_BOOK3S_PR
 
23
#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
24
24
static inline struct kvmppc_book3s_shadow_vcpu *svcpu_get(struct kvm_vcpu *vcpu)
25
25
{
26
26
        preempt_disable();
35
35
 
36
36
#define SPAPR_TCE_SHIFT         12
37
37
 
38
 
#ifdef CONFIG_KVM_BOOK3S_64_HV
 
38
#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
39
39
#define KVM_DEFAULT_HPT_ORDER   24      /* 16MB HPT by default */
40
40
extern unsigned long kvm_rma_pages;
41
41
#endif
278
278
                (HPTE_V_1TB_SEG | (VRMA_VSID << (40 - 16)));
279
279
}
280
280
 
281
 
#ifdef CONFIG_KVM_BOOK3S_64_HV
 
281
#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
282
282
/*
283
283
 * Note modification of an HPTE; set the HPTE modified bit
284
284
 * if anyone is interested.
289
289
        if (atomic_read(&kvm->arch.hpte_mod_interest))
290
290
                rev->guest_rpte |= HPTE_GR_MODIFIED;
291
291
}
292
 
#endif /* CONFIG_KVM_BOOK3S_64_HV */
 
292
#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */
293
293
 
294
294
#endif /* __ASM_KVM_BOOK3S_64_H__ */