diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-08 07:03:11 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-08 07:03:11 +0300 |
| commit | d5112a4f31a361409d3c57dc9d58dd69f8014bef (patch) | |
| tree | 64771300b2191cb94d9aaf60355661a01c2ccd1a /drivers/kvm/mmu.c | |
| parent | 12e86f92fcfe4f0bcab0ad7fa4088a64c60d9b38 (diff) | |
| parent | 5fad293bcbd48d9a2370020cf60e4b4a42559b12 (diff) | |
| download | linux-d5112a4f31a361409d3c57dc9d58dd69f8014bef.tar.xz | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
Diffstat (limited to 'drivers/kvm/mmu.c')
| -rw-r--r-- | drivers/kvm/mmu.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c index c6f972914f08..22c426cd8cb2 100644 --- a/drivers/kvm/mmu.c +++ b/drivers/kvm/mmu.c @@ -143,6 +143,7 @@ static int dbg = 1; #define PFERR_PRESENT_MASK (1U << 0) #define PFERR_WRITE_MASK (1U << 1) #define PFERR_USER_MASK (1U << 2) +#define PFERR_FETCH_MASK (1U << 4) #define PT64_ROOT_LEVEL 4 #define PT32_ROOT_LEVEL 2 @@ -168,6 +169,11 @@ static int is_cpuid_PSE36(void) return 1; } +static int is_nx(struct kvm_vcpu *vcpu) +{ + return vcpu->shadow_efer & EFER_NX; +} + static int is_present_pte(unsigned long pte) { return pte & PT_PRESENT_MASK; @@ -992,16 +998,6 @@ static inline int fix_read_pf(u64 *shadow_ent) return 0; } -static int may_access(u64 pte, int write, int user) -{ - - if (user && !(pte & PT_USER_MASK)) - return 0; - if (write && !(pte & PT_WRITABLE_MASK)) - return 0; - return 1; -} - static void paging_free(struct kvm_vcpu *vcpu) { nonpaging_free(vcpu); |