|
@@ -118,21 +118,20 @@ static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr,
|
|
unsigned long end, int write, struct page **pages, int *nr)
|
|
unsigned long end, int write, struct page **pages, int *nr)
|
|
{
|
|
{
|
|
unsigned long mask;
|
|
unsigned long mask;
|
|
- pte_t pte = *(pte_t *)&pmd;
|
|
|
|
struct page *head, *page;
|
|
struct page *head, *page;
|
|
int refs;
|
|
int refs;
|
|
|
|
|
|
mask = _PAGE_PRESENT|_PAGE_USER;
|
|
mask = _PAGE_PRESENT|_PAGE_USER;
|
|
if (write)
|
|
if (write)
|
|
mask |= _PAGE_RW;
|
|
mask |= _PAGE_RW;
|
|
- if ((pte_flags(pte) & mask) != mask)
|
|
|
|
|
|
+ if ((pmd_flags(pmd) & mask) != mask)
|
|
return 0;
|
|
return 0;
|
|
/* hugepages are never "special" */
|
|
/* hugepages are never "special" */
|
|
- VM_BUG_ON(pte_flags(pte) & _PAGE_SPECIAL);
|
|
|
|
- VM_BUG_ON(!pfn_valid(pte_pfn(pte)));
|
|
|
|
|
|
+ VM_BUG_ON(pmd_flags(pmd) & _PAGE_SPECIAL);
|
|
|
|
+ VM_BUG_ON(!pfn_valid(pmd_pfn(pmd)));
|
|
|
|
|
|
refs = 0;
|
|
refs = 0;
|
|
- head = pte_page(pte);
|
|
|
|
|
|
+ head = pmd_page(pmd);
|
|
page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
|
|
page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
|
|
do {
|
|
do {
|
|
VM_BUG_ON_PAGE(compound_head(page) != head, page);
|
|
VM_BUG_ON_PAGE(compound_head(page) != head, page);
|
|
@@ -195,21 +194,20 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr,
|
|
unsigned long end, int write, struct page **pages, int *nr)
|
|
unsigned long end, int write, struct page **pages, int *nr)
|
|
{
|
|
{
|
|
unsigned long mask;
|
|
unsigned long mask;
|
|
- pte_t pte = *(pte_t *)&pud;
|
|
|
|
struct page *head, *page;
|
|
struct page *head, *page;
|
|
int refs;
|
|
int refs;
|
|
|
|
|
|
mask = _PAGE_PRESENT|_PAGE_USER;
|
|
mask = _PAGE_PRESENT|_PAGE_USER;
|
|
if (write)
|
|
if (write)
|
|
mask |= _PAGE_RW;
|
|
mask |= _PAGE_RW;
|
|
- if ((pte_flags(pte) & mask) != mask)
|
|
|
|
|
|
+ if ((pud_flags(pud) & mask) != mask)
|
|
return 0;
|
|
return 0;
|
|
/* hugepages are never "special" */
|
|
/* hugepages are never "special" */
|
|
- VM_BUG_ON(pte_flags(pte) & _PAGE_SPECIAL);
|
|
|
|
- VM_BUG_ON(!pfn_valid(pte_pfn(pte)));
|
|
|
|
|
|
+ VM_BUG_ON(pud_flags(pud) & _PAGE_SPECIAL);
|
|
|
|
+ VM_BUG_ON(!pfn_valid(pud_pfn(pud)));
|
|
|
|
|
|
refs = 0;
|
|
refs = 0;
|
|
- head = pte_page(pte);
|
|
|
|
|
|
+ head = pud_page(pud);
|
|
page = head + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
|
|
page = head + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
|
|
do {
|
|
do {
|
|
VM_BUG_ON_PAGE(compound_head(page) != head, page);
|
|
VM_BUG_ON_PAGE(compound_head(page) != head, page);
|