diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2018-01-24 14:10:04 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-01-24 14:22:38 +0530 |
| commit | 3210a869aef46e80cb7f5e31099d97be019af39e (patch) | |
| tree | aa54cd46f639edf68f62f3c34303d93ab842fb82 | |
| parent | 6a7d9fbcf9464502248405214cd10842da255fcc (diff) | |
LSK-ANDROID: arm64: mm: Fix __create_pgd_mapping() call
Fix AOSP backport of "FROMLIST: arm64: mm: Map entry trampoline
into trampoline and kernel page tables", which is tweaked to
match __create_pgd_mapping() API on android-4.4, but the related
upstream patch is already pushed in LSK commit 3bbd245ee850
("arm64: mm: add param to force create_pgd_mapping() to use page mappings").
Otherwise we run into following build error reported on KernelCI
https://kernelci.org/build/lsk/branch/linux-linaro-lsk-v4.4-android/kernel/lsk-v4.4-17.11-android-844-g6a7d9fbcf946/
arch/arm64/mm/mmu.c:501:2: error: too few arguments to function '__create_pgd_mapping'
Fixes: AOSP Change-Id: I31b2dcdf4db36c3e31181fe43ccb984f9efb6ac6
("FROMLIST: arm64: mm: Map entry trampoline into trampoline and kernel page tables")
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | arch/arm64/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 950cff3ecef2..63f6631178eb 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -499,7 +499,7 @@ static int __init map_entry_trampoline(void) /* Map only the text into the trampoline page table */ memset(tramp_pg_dir, 0, PGD_SIZE); __create_pgd_mapping(tramp_pg_dir, pa_start, TRAMP_VALIAS, PAGE_SIZE, - prot, late_pgtable_alloc); + prot, late_pgtable_alloc, 0); /* Map both the text and data into the kernel page table */ __set_fixmap(FIX_ENTRY_TRAMP_TEXT, pa_start, prot); |