diff options
Diffstat (limited to 'arch/csky/mm')
| -rw-r--r-- | arch/csky/mm/fault.c | 10 | ||||
| -rw-r--r-- | arch/csky/mm/highmem.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c index 0b9cbf2cf6a9..b1dce9f2f04d 100644 --- a/arch/csky/mm/fault.c +++ b/arch/csky/mm/fault.c @@ -183,13 +183,13 @@ bad_area: bad_area_nosemaphore: /* User mode accesses just cause a SIGSEGV */ if (user_mode(regs)) { - tsk->thread.trap_no = (regs->sr >> 16) & 0xff; + tsk->thread.trap_no = trap_no(regs); force_sig_fault(SIGSEGV, si_code, (void __user *)address); return; } no_context: - tsk->thread.trap_no = (regs->sr >> 16) & 0xff; + tsk->thread.trap_no = trap_no(regs); /* Are we prepared to handle this kernel fault? */ if (fixup_exception(regs)) @@ -202,10 +202,10 @@ no_context: bust_spinlocks(1); pr_alert("Unable to handle kernel paging request at virtual " "address 0x%08lx, pc: 0x%08lx\n", address, regs->pc); - die_if_kernel("Oops", regs, write); + die(regs, "Oops"); out_of_memory: - tsk->thread.trap_no = (regs->sr >> 16) & 0xff; + tsk->thread.trap_no = trap_no(regs); /* * We ran out of memory, call the OOM killer, and return the userspace @@ -215,7 +215,7 @@ out_of_memory: return; do_sigbus: - tsk->thread.trap_no = (regs->sr >> 16) & 0xff; + tsk->thread.trap_no = trap_no(regs); mmap_read_unlock(mm); diff --git a/arch/csky/mm/highmem.c b/arch/csky/mm/highmem.c index 89ec32e602a1..89c10800a002 100644 --- a/arch/csky/mm/highmem.c +++ b/arch/csky/mm/highmem.c @@ -19,8 +19,6 @@ void kmap_flush_tlb(unsigned long addr) } EXPORT_SYMBOL(kmap_flush_tlb); -EXPORT_SYMBOL(kmap); - void *kmap_atomic_high_prot(struct page *page, pgprot_t prot) { unsigned long vaddr; |