diff options
Diffstat (limited to 'arch/frv/mm')
-rw-r--r-- | arch/frv/mm/fault.c | 8 | ||||
-rw-r--r-- | arch/frv/mm/tlb-miss.S | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c index 30f5d100a81c..a325d57a83d5 100644 --- a/arch/frv/mm/fault.c +++ b/arch/frv/mm/fault.c | |||
@@ -257,10 +257,10 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear | |||
257 | */ | 257 | */ |
258 | out_of_memory: | 258 | out_of_memory: |
259 | up_read(&mm->mmap_sem); | 259 | up_read(&mm->mmap_sem); |
260 | printk("VM: killing process %s\n", current->comm); | 260 | if (!user_mode(__frame)) |
261 | if (user_mode(__frame)) | 261 | goto no_context; |
262 | do_group_exit(SIGKILL); | 262 | pagefault_out_of_memory(); |
263 | goto no_context; | 263 | return; |
264 | 264 | ||
265 | do_sigbus: | 265 | do_sigbus: |
266 | up_read(&mm->mmap_sem); | 266 | up_read(&mm->mmap_sem); |
diff --git a/arch/frv/mm/tlb-miss.S b/arch/frv/mm/tlb-miss.S index 7f392bc651a3..f3ac019bb18b 100644 --- a/arch/frv/mm/tlb-miss.S +++ b/arch/frv/mm/tlb-miss.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
16 | #include <asm/spr-regs.h> | 16 | #include <asm/spr-regs.h> |
17 | 17 | ||
18 | .section .text.tlbmiss | 18 | .section .text..tlbmiss |
19 | .balign 4 | 19 | .balign 4 |
20 | 20 | ||
21 | .globl __entry_insn_mmu_miss | 21 | .globl __entry_insn_mmu_miss |