diff --git a/[refs] b/[refs] index 467c47994c37..cf7349e0b084 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34a0b3cdc078746788ffc49e56da0db62b8b6ea4 +refs/heads/master: 12074a35b4ef36d7a971beaf42412b22f304cdd1 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 5bfa52a98630..8d10b5540c73 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -1146,12 +1146,12 @@ int zeromap_page_range(struct vm_area_struct *vma, return err; } -pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl) +pte_t * fastcall get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl) { pgd_t * pgd = pgd_offset(mm, addr); pud_t * pud = pud_alloc(mm, pgd, addr); if (pud) { - pmd_t * pmd = pmd_alloc(mm, pgd, addr); + pmd_t * pmd = pmd_alloc(mm, pud, addr); if (pmd) return pte_alloc_map_lock(mm, pmd, addr, ptl); }