Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74347
b: refs/heads/master
c: 2c80b01
h: refs/heads/master
i:
  74345: 2aac5f1
  74343: faf90db
v: v3
  • Loading branch information
Jeremy Fitzhardinge authored and Linus Torvalds committed Nov 29, 2007
1 parent 4beb60c commit 6ac47b1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c06869d660ceffec7dc0fca19ed9646ed5845c7f
refs/heads/master: 2c80b01beae3db9f99a161ec216405dd694bc4c2
4 changes: 4 additions & 0 deletions trunk/arch/x86/xen/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,8 @@ pte_t xen_make_pte(unsigned long long pte)
if (pte & 1)
pte = phys_to_machine(XPADDR(pte)).maddr;

pte &= ~_PAGE_PCD;

return (pte_t){ pte, pte >> 32 };
}

Expand Down Expand Up @@ -291,6 +293,8 @@ pte_t xen_make_pte(unsigned long pte)
if (pte & _PAGE_PRESENT)
pte = phys_to_machine(XPADDR(pte)).maddr;

pte &= ~_PAGE_PCD;

return (pte_t){ pte };
}

Expand Down

0 comments on commit 6ac47b1

Please sign in to comment.