diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-02 15:10:00 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-02 15:10:00 +1000 |
| commit | 29dd111c576bcdd7a17483405d67ec8a81a6a2fc (patch) | |
| tree | 86e1a1560b6b93d035d3e6448874e820c4e25857 /arch/metag/mm/hugetlbpage.c | |
| parent | 1bc60b48157f140f72a98357b7f1f4eef12a887b (diff) | |
| parent | d25f0d9c6100a46e1e35cde84b4bb8b892254180 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'arch/metag/mm/hugetlbpage.c')
| -rw-r--r-- | arch/metag/mm/hugetlbpage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c index db1b7da91e4f..67fd53e2935a 100644 --- a/arch/metag/mm/hugetlbpage.c +++ b/arch/metag/mm/hugetlbpage.c @@ -74,7 +74,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, return pte; } -pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) +pte_t *huge_pte_offset(struct mm_struct *mm, + unsigned long addr, unsigned long sz) { pgd_t *pgd; pud_t *pud; |