diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-05 23:09:05 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-05 23:09:05 +0300 |
| commit | 947c2a83584d3093efea1edf52430db47f11080f (patch) | |
| tree | d9c5bd69171d5c03d2bd663897568612451641b3 /arch/parisc/mm/fixmap.c | |
| parent | c9d26d8de10f7c4decd10b6e75f5593c11ff9dfc (diff) | |
| parent | 99b2f159b6e76b84357eae6dc2a206871aa630d5 (diff) | |
| download | linux-947c2a83584d3093efea1edf52430db47f11080f.tar.xz | |
Merge tag 'parisc-for-6.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc architecture fixes from Helge Deller:
- early fixmap preallocation to fix boot failures on kernel >= 6.4
- remove DMA leftover code in parport_gsc
- drop old comments and code style fixes
* tag 'parisc-for-6.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: unaligned: Add required spaces after ','
parport: gsc: remove DMA leftover code
parisc: pci-dma: remove unused and dead EISA code and comment
parisc/mm: preallocate fixmap page tables at init
Diffstat (limited to 'arch/parisc/mm/fixmap.c')
| -rw-r--r-- | arch/parisc/mm/fixmap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/parisc/mm/fixmap.c b/arch/parisc/mm/fixmap.c index cc15d737fda6..ae3493dae9dc 100644 --- a/arch/parisc/mm/fixmap.c +++ b/arch/parisc/mm/fixmap.c @@ -19,9 +19,6 @@ void notrace set_fixmap(enum fixed_addresses idx, phys_addr_t phys) pmd_t *pmd = pmd_offset(pud, vaddr); pte_t *pte; - if (pmd_none(*pmd)) - pte = pte_alloc_kernel(pmd, vaddr); - pte = pte_offset_kernel(pmd, vaddr); set_pte_at(&init_mm, vaddr, pte, __mk_pte(phys, PAGE_KERNEL_RWX)); flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE); |