diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-18 12:05:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-18 12:05:46 -0700 |
| commit | 9899b587588fb6ced0597e188e049f1ab92c7003 (patch) | |
| tree | a1eb53c628e400f4fc12467f11cfefeadda89386 /include/linux | |
| parent | mm/memory.c: skip spurious TLB flush for retried page fault (diff) | |
| parent | arch/ia64: Restore arch-specific pgd_offset_k implementation (diff) | |
| download | wireguard-linux-9899b587588fb6ced0597e188e049f1ab92c7003.tar.xz wireguard-linux-9899b587588fb6ced0597e188e049f1ab92c7003.zip | |
Merge tag 'fixes-2020-08-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull ia64 page table fix from Mike Rapoport:
"Fix regression in IA-64 caused by page table allocation refactoring
The refactoring and consolidation of <asm/pgalloc.h> caused regression
on parisc and ia64. The fix for parisc made it into v5.9-rc1 while the
fix ia64 got delayed a bit and here it is"
* tag 'fixes-2020-08-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
arch/ia64: Restore arch-specific pgd_offset_k implementation
Diffstat (limited to 'include/linux')
| -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 |