diff options
| author | Mark Brown <broonie@linaro.org> | 2014-12-04 22:38:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-04 22:38:46 +0000 |
| commit | 11fd101c2ff91afae2e1d79e33caa9f50430ab14 (patch) | |
| tree | e01dc813ceb4e61388551be71f71e671a320f053 /arch/arm64/include/asm/pgtable.h | |
| parent | f535f673bd5fbcda71fb0aa525da0703d7907027 (diff) | |
arm64: mm: Fix mismerge in pgtable.h
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'arch/arm64/include/asm/pgtable.h')
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 33608f263ad0..e28747e15a36 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -271,7 +271,7 @@ static inline pmd_t pte_pmd(pte_t pte) #define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK)) -#define set_pmd_at(mm, addr, pmdp, pmd) set_pmd(pmdp, pmd) +#define set_pmd_at(mm, addr, pmdp, pmd) set_pte_at(mm, addr, (pte_t *)pmdp, pmd_pte(pmd)) static inline int has_transparent_hugepage(void) { |