diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-11 17:54:30 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-11 17:54:30 +0300 |
| commit | ae8bd85ca8a4a812721388ab85b3d67077951f52 (patch) | |
| tree | b01af045e7352464aa5ede530dc772dc52e5907e /include/linux/pgtable.h | |
| parent | 7b75cd5128421c673153efb1236705696a1a9812 (diff) | |
| parent | c9b69a0cf0b4336fe7d2e35c46273debc68910fd (diff) | |
| download | linux-ae8bd85ca8a4a812721388ab85b3d67077951f52.tar.xz | |
Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include/linux/pgtable.h')
| -rw-r--r-- | include/linux/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index a124c21e3204..e8cbc2e795d5 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -117,7 +117,9 @@ static inline pgd_t *pgd_offset_pgd(pgd_t *pgd, unsigned long address) * a shortcut which implies the use of the kernel's pgd, instead * of a process's */ +#ifndef pgd_offset_k #define pgd_offset_k(address) pgd_offset(&init_mm, (address)) +#endif /* * In many cases it is known that a virtual address is mapped at PMD or PTE |