aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/pgd.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-14 20:41:53 +0000
committerMark Brown <broonie@linaro.org>2014-01-14 20:41:53 +0000
commit64a9aa9cf57dd551a9ae9bf48f5e63be608aae72 (patch)
treed5776aa6b85c7a0c4fa3565bd3881f9607c293dc /arch/arm/mm/pgd.c
parent16d7ea9167839d0b971ab29030886280595dd5fc (diff)
parent374b105797c3d4f29c685f3be535c35f5689b30e (diff)
downloadkernel_replicant_linux-64a9aa9cf57dd551a9ae9bf48f5e63be608aae72.tar.gz
kernel_replicant_linux-64a9aa9cf57dd551a9ae9bf48f5e63be608aae72.tar.bz2
kernel_replicant_linux-64a9aa9cf57dd551a9ae9bf48f5e63be608aae72.zip
Merge tag 'v3.13-rc3' into asoc-pcm
Linux 3.13-rc3
Diffstat (limited to 'arch/arm/mm/pgd.c')
-rw-r--r--arch/arm/mm/pgd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c
index 0acb089d0f70..1046b373d1ae 100644
--- a/arch/arm/mm/pgd.c
+++ b/arch/arm/mm/pgd.c
@@ -87,7 +87,8 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
init_pud = pud_offset(init_pgd, 0);
init_pmd = pmd_offset(init_pud, 0);
init_pte = pte_offset_map(init_pmd, 0);
- set_pte_ext(new_pte, *init_pte, 0);
+ set_pte_ext(new_pte + 0, init_pte[0], 0);
+ set_pte_ext(new_pte + 1, init_pte[1], 0);
pte_unmap(init_pte);
pte_unmap(new_pte);
}