diff options
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/kernel/time.c | 5 | ||||
| -rw-r--r-- | arch/frv/mm/fault.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c index ed588d73d7d..e83e0bccfab 100644 --- a/arch/frv/kernel/time.c +++ b/arch/frv/kernel/time.c @@ -43,7 +43,10 @@ unsigned long __delay_loops_MHz; static irqreturn_t timer_interrupt(int irq, void *dummy); static struct irqaction timer_irq = { - timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL + .handler = timer_interrupt, + .flags = IRQF_DISABLED, + .mask = CPU_MASK_NONE, + .name = "timer", }; static inline int set_rtc_mmss(unsigned long nowtime) diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c index 6798fa0257b..05093d41d98 100644 --- a/arch/frv/mm/fault.c +++ b/arch/frv/mm/fault.c @@ -259,7 +259,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear up_read(&mm->mmap_sem); printk("VM: killing process %s\n", current->comm); if (user_mode(__frame)) - do_exit(SIGKILL); + do_group_exit(SIGKILL); goto no_context; do_sigbus: |