diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-08-13 13:40:10 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-08-13 13:40:10 +0300 |
| commit | 58e16d792a6a8c6b750f637a4649967fcac853dc (patch) | |
| tree | 778a940499ecfc6fb2d811dbfef735913d30618a /arch/parisc/mm | |
| parent | fa8397e45c64e60c80373bc19ee56e42a6bed9b6 (diff) | |
| parent | a304f483b6b00d42bde41c45ca52c670945348e2 (diff) | |
| download | linux-58e16d792a6a8c6b750f637a4649967fcac853dc.tar.xz | |
Merge branch 'ti-sysc-fixes' into fixes
Diffstat (limited to 'arch/parisc/mm')
| -rw-r--r-- | arch/parisc/mm/Makefile | 1 | ||||
| -rw-r--r-- | arch/parisc/mm/fault.c | 4 | ||||
| -rw-r--r-- | arch/parisc/mm/fixmap.c | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/arch/parisc/mm/Makefile b/arch/parisc/mm/Makefile index 20e39b043a60..ffdb5c0a8cc6 100644 --- a/arch/parisc/mm/Makefile +++ b/arch/parisc/mm/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Makefile for arch/parisc/mm # diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index c8e8b7c05558..6dd4669ce7a5 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -403,13 +403,13 @@ bad_area: lsb = PAGE_SHIFT; force_sig_mceerr(BUS_MCEERR_AR, (void __user *) address, - lsb, current); + lsb); return; } #endif show_signal_msg(regs, code, address, tsk, vma); - force_sig_fault(signo, si_code, (void __user *) address, current); + force_sig_fault(signo, si_code, (void __user *) address); return; } diff --git a/arch/parisc/mm/fixmap.c b/arch/parisc/mm/fixmap.c index c8d41b54fb19..474cd241c150 100644 --- a/arch/parisc/mm/fixmap.c +++ b/arch/parisc/mm/fixmap.c @@ -10,7 +10,7 @@ #include <asm/cacheflush.h> #include <asm/fixmap.h> -void set_fixmap(enum fixed_addresses idx, phys_addr_t phys) +void notrace set_fixmap(enum fixed_addresses idx, phys_addr_t phys) { unsigned long vaddr = __fix_to_virt(idx); pgd_t *pgd = pgd_offset_k(vaddr); @@ -28,13 +28,16 @@ void set_fixmap(enum fixed_addresses idx, phys_addr_t phys) flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE); } -void clear_fixmap(enum fixed_addresses idx) +void notrace clear_fixmap(enum fixed_addresses idx) { unsigned long vaddr = __fix_to_virt(idx); pgd_t *pgd = pgd_offset_k(vaddr); pmd_t *pmd = pmd_offset(pgd, vaddr); pte_t *pte = pte_offset_kernel(pmd, vaddr); + if (WARN_ON(pte_none(*pte))) + return; + pte_clear(&init_mm, vaddr, pte); flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE); |