Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+11
+9
arch/ia64/include/asm/pgtable.h
+9
arch/ia64/include/asm/pgtable.h
···
366
366
}
367
367
#define pgd_index pgd_index
368
368
369
+
/*
370
+
* In the kernel's mapped region we know everything is in region number 5, so
371
+
* as an optimisation its PGD already points to the area for that region.
372
+
* However, this also means that we cannot use pgd_index() and we must
373
+
* never add the region here.
374
+
*/
375
+
#define pgd_offset_k(addr) \
376
+
(init_mm.pgd + (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)))
377
+
369
378
/* Look up a pgd entry in the gate area. On IA-64, the gate-area
370
379
resides in the kernel-mapped segment, hence we use pgd_offset_k()
371
380
here. */
+2
include/linux/pgtable.h
+2
include/linux/pgtable.h
···
117
117
* a shortcut which implies the use of the kernel's pgd, instead
118
118
* of a process's
119
119
*/
120
+
#ifndef pgd_offset_k
120
121
#define pgd_offset_k(address) pgd_offset(&init_mm, (address))
122
+
#endif
121
123
122
124
/*
123
125
* In many cases it is known that a virtual address is mapped at PMD or PTE